Mercurial > ecos

changeset 2026:e3581c918d49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/sys/netinet/ip_output.c (ip_output): initialize len to 0. * src/sys/net/if.c (ifioctl): Cast to keep compiler happy. * src/ecos/support.c (_mask): Use the correct cast to keep the compiler happy. * include/sys/param.h: give proc0 the correct type so we don't have to cast it and avoid a compiler warning. * src/sys/kern/uipc_socket.c (soopt_mcopyout): Lefthand casts no longer allowed with gcc4. * src/sys/net/if_ethersubr.c (ether_resolvemulti): Cast to keep compiler happy. * src/sys/net/rtsock.c: Define routedomain consistently to avoid compiler warnings.
author asl
date Sat, 30 Jul 2005 11:23:28 +0000
parents 2de3997bad7b
children e5289c8ad97a
files packages/net/bsd_tcpip/current/ChangeLog packages/net/bsd_tcpip/current/include/sys/param.h packages/net/bsd_tcpip/current/src/ecos/support.c packages/net/bsd_tcpip/current/src/sys/kern/kern_subr.c packages/net/bsd_tcpip/current/src/sys/kern/sockio.c packages/net/bsd_tcpip/current/src/sys/kern/uipc_socket.c packages/net/bsd_tcpip/current/src/sys/net/if.c packages/net/bsd_tcpip/current/src/sys/net/if_ethersubr.c packages/net/bsd_tcpip/current/src/sys/net/radix.c packages/net/bsd_tcpip/current/src/sys/net/rtsock.c packages/net/bsd_tcpip/current/src/sys/netinet/in.c packages/net/bsd_tcpip/current/src/sys/netinet/ip_output.c packages/net/bsd_tcpip/current/src/sys/netinet/tcp_input.c packages/net/bsd_tcpip/current/src/sys/netinet/udp_usrreq.c
diffstat 14 files changed, 34 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/packages/net/bsd_tcpip/current/ChangeLog
+++ b/packages/net/bsd_tcpip/current/ChangeLog
@@ -1,3 +1,18 @@
+2005-07-29  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* src/sys/netinet/ip_output.c (ip_output): initialize len to 0.
+	* src/sys/net/if.c (ifioctl): Cast to keep compiler happy.
+	* src/ecos/support.c (_mask): Use the correct cast to keep the
+	compiler happy.
+	* include/sys/param.h: give proc0 the correct type so we don't
+	have to cast it and avoid a compiler warning.
+	* src/sys/kern/uipc_socket.c (soopt_mcopyout): Lefthand casts no
+	longer allowed with gcc4. 
+	* src/sys/net/if_ethersubr.c (ether_resolvemulti): Cast to keep
+	compiler happy.
+	* src/sys/net/rtsock.c: Define routedomain consistently to avoid
+	compiler warnings.
+	
 2005-06-23  Gary Thomas  <gary@mlbassoc.com>
 
 	* include/netinet/if_ether.h: Adjust size of struct sockaddr_inarp
--- a/packages/net/bsd_tcpip/current/include/sys/param.h
+++ b/packages/net/bsd_tcpip/current/include/sys/param.h
@@ -785,7 +785,7 @@ extern int hz;
 extern volatile struct timeval ktime;
 #define time_second ktime.tv_sec
 extern int tick;
-extern int proc0;
+extern struct proc * proc0;
 #define curproc 0
 extern void microtime(struct timeval *tp);
 extern void getmicrotime(struct timeval *tp);
--- a/packages/net/bsd_tcpip/current/src/ecos/support.c
+++ b/packages/net/bsd_tcpip/current/src/ecos/support.c
@@ -95,7 +95,7 @@ int hz = 100;
 int tick = 10000;  // usec per "tick"
 volatile struct timeval ktime;
 int proc = 0;  // unused
-int proc0 = 0;  // unused
+struct proc * proc0 = 0;  // unused
 
 volatile struct timeval mono_time;
 
@@ -900,7 +900,7 @@ typedef void pr_fun(char *fmt, ...);
 static void
 _mask(struct sockaddr *sa, char *buf, int _len)
 {
-    unsigned char *cp = ((char *)sa) + 4;
+    unsigned char *cp = ((unsigned char *)sa) + 4;
     int len = sa->sa_len - 4;
     int tot = 0;
 
--- a/packages/net/bsd_tcpip/current/src/sys/kern/kern_subr.c
+++ b/packages/net/bsd_tcpip/current/src/sys/kern/kern_subr.c
@@ -104,8 +104,8 @@ uiomove(cp, n, uio)
 				bcopy(iov->iov_base, (caddr_t)cp, cnt);
 			break;
 		}
-                (char *)(iov->iov_base) += cnt;
-		iov->iov_len -= cnt;
+                iov->iov_base = (char *)iov->iov_base + cnt;
+                iov->iov_len -= cnt;
 		uio->uio_resid -= cnt;
 		uio->uio_offset += cnt;
 		cp += cnt;
--- a/packages/net/bsd_tcpip/current/src/sys/kern/sockio.c
+++ b/packages/net/bsd_tcpip/current/src/sys/kern/sockio.c
@@ -217,7 +217,7 @@ bsd_socket(cyg_nstab_entry *nste, int do
     int error = 0;
     struct socket *so;
 
-    error = socreate(domain, &so, type, protocol, (struct proc *)&proc0);
+    error = socreate(domain, &so, type, protocol, proc0);
 
     if( error == ENOERR)
     {
--- a/packages/net/bsd_tcpip/current/src/sys/kern/uipc_socket.c
+++ b/packages/net/bsd_tcpip/current/src/sys/kern/uipc_socket.c
@@ -1434,7 +1434,7 @@ soopt_mcopyin(struct sockopt *sopt, stru
 		} else
 			bcopy(sopt->sopt_val, mtod(m, char *), m->m_len);
 		sopt->sopt_valsize -= m->m_len;
-		(caddr_t)sopt->sopt_val += m->m_len;
+		sopt->sopt_val = (char *)sopt->sopt_val + m->m_len;
 		m = m->m_next;
 	}
 	if (m != NULL) /* should be allocated enoughly at ip6_sooptmcopyin() */
@@ -1464,7 +1464,7 @@ soopt_mcopyout(struct sockopt *sopt, str
 		} else
 			bcopy(mtod(m, char *), sopt->sopt_val, m->m_len);
 	       sopt->sopt_valsize -= m->m_len;
-	       (caddr_t)sopt->sopt_val += m->m_len;
+               sopt->sopt_val = (char *)sopt->sopt_val + m->m_len;
 	       valsize += m->m_len;
 	       m = m->m_next;
 	}
--- a/packages/net/bsd_tcpip/current/src/sys/net/if.c
+++ b/packages/net/bsd_tcpip/current/src/sys/net/if.c
@@ -1260,7 +1260,7 @@ ifioctl(so, cmd, data, p)
 
 	case SIOCSIFLLADDR:
 		return if_setlladdr(ifp,
-		    ifr->ifr_addr.sa_data, ifr->ifr_addr.sa_len);
+		    (u_char *)ifr->ifr_addr.sa_data, ifr->ifr_addr.sa_len);
 
 	default:
 		oif_flags = ifp->if_flags;
--- a/packages/net/bsd_tcpip/current/src/sys/net/if_ethersubr.c
+++ b/packages/net/bsd_tcpip/current/src/sys/net/if_ethersubr.c
@@ -892,7 +892,7 @@ ether_resolvemulti(ifp, llsa, sa)
 		 * No mapping needed. Just check that it's a valid MC address.
 		 */
 		sdl = (struct sockaddr_dl *)sa;
-		e_addr = LLADDR(sdl);
+		e_addr = (u_char *)LLADDR(sdl);
 		if ((e_addr[0] & 1) != 1)
 			return EADDRNOTAVAIL;
 		*llsa = 0;
@@ -910,7 +910,7 @@ ether_resolvemulti(ifp, llsa, sa)
 		sdl->sdl_index = ifp->if_index;
 		sdl->sdl_type = IFT_ETHER;
 		sdl->sdl_alen = ETHER_ADDR_LEN;
-		e_addr = LLADDR(sdl);
+		e_addr = (u_char *)LLADDR(sdl);
 		ETHER_MAP_IP_MULTICAST(&sin->sin_addr, e_addr);
 		*llsa = (struct sockaddr *)sdl;
 		return 0;
--- a/packages/net/bsd_tcpip/current/src/sys/net/radix.c
+++ b/packages/net/bsd_tcpip/current/src/sys/net/radix.c
@@ -1090,6 +1090,6 @@ rn_init()
 	addmask_key = cplim = rn_ones + max_keylen;
 	while (cp < cplim)
 		*cp++ = -1;
-	if (rn_inithead((void **)&mask_rnhead, 0) == 0)
+	if (rn_inithead((void **)(void*)&mask_rnhead, 0) == 0)
 		panic("rn_init 2");
 }
--- a/packages/net/bsd_tcpip/current/src/sys/net/rtsock.c
+++ b/packages/net/bsd_tcpip/current/src/sys/net/rtsock.c
@@ -1020,7 +1020,7 @@ SYSCTL_NODE(_net, PF_ROUTE, routetable, 
  * Definitions of protocols supported in the ROUTE domain.
  */
 
-extern struct domain routedomain;		/* or at least forward */
+static struct domain routedomain;		/* or at least forward */
 
 static struct protosw routesw[] = {
 { SOCK_RAW,	&routedomain,	0,		PR_ATOMIC|PR_ADDR,
--- a/packages/net/bsd_tcpip/current/src/sys/netinet/in.c
+++ b/packages/net/bsd_tcpip/current/src/sys/netinet/in.c
@@ -548,7 +548,8 @@ in_lifaddr_ioctl(so, cmd, data, ifp, p)
 		struct sockaddr_in *sin;
 		int cmp;
 
-		bzero(&mask, sizeof(mask));
+                bzero(&match.s_addr, sizeof(match.s_addr));
+                bzero(&mask, sizeof(mask));
 		if (iflr->flags & IFLR_PREFIX) {
 			/* lookup a prefix rather than address. */
 			in_len2mask(&mask, iflr->prefixlen);
--- a/packages/net/bsd_tcpip/current/src/sys/netinet/ip_output.c
+++ b/packages/net/bsd_tcpip/current/src/sys/netinet/ip_output.c
@@ -133,7 +133,7 @@ ip_output(m0, opt, ro, flags, imo)
 	struct ifnet *ifp;
 	struct mbuf *m = m0;
 	int hlen = sizeof (struct ip);
-	int len, off, error = 0;
+	int len=0, off, error = 0;
 	struct sockaddr_in *dst;
 	struct in_ifaddr *ia = NULL;
 	int isbroadcast, sw_csum;
--- a/packages/net/bsd_tcpip/current/src/sys/netinet/tcp_input.c
+++ b/packages/net/bsd_tcpip/current/src/sys/netinet/tcp_input.c
@@ -1134,7 +1134,7 @@ findpcb:
 		laddr = inp->inp_laddr;
 		if (inp->inp_laddr.s_addr == INADDR_ANY)
 			inp->inp_laddr = ip->ip_dst;
-		if (in_pcbconnect(inp, (struct sockaddr *)sin, (struct proc *)&proc0)) {
+		if (in_pcbconnect(inp, (struct sockaddr *)sin, proc0)) {
 			inp->inp_laddr = laddr;
 			FREE(sin, M_SONAME);
 			goto drop;
--- a/packages/net/bsd_tcpip/current/src/sys/netinet/udp_usrreq.c
+++ b/packages/net/bsd_tcpip/current/src/sys/netinet/udp_usrreq.c
@@ -672,7 +672,8 @@ udp_output(inp, m, addr, control, p)
 	struct sockaddr_in *sin;
 	int s = 0, error = 0;
 
-	if (control)
+        bzero(&laddr, sizeof(laddr));
+        if (control)
 		m_freem(control);		/* XXX */
 
 	if (len + sizeof(struct udpiphdr) > IP_MAXPACKET) {