i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix warnings. And a possible crashing (memory corruption) bug, too.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5169 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Philippe Houdoin
2003-10-25 22:48:15 +00:00
parent 7dab5189a7
commit 68d8b27d8c
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/network/protocols/ipv4/ipv4.c
+15 -11
View File
@@ -46,6 +46,8 @@ static net_timer_id timerid;
struct ipstat ipstat; //XXX might need to be shared struct ipstat ipstat; //XXX might need to be shared
static uint16 get_ip_id(void);
static void ipv4_input(struct mbuf *, int); static void ipv4_input(struct mbuf *, int);
static int ipv4_output(struct mbuf *, struct mbuf *, struct route *, int, void *); static int ipv4_output(struct mbuf *, struct mbuf *, struct route *, int, void *);
static int ipv4_ctloutput(int, struct socket *, int, int, struct mbuf **); static int ipv4_ctloutput(int, struct socket *, int, int, struct mbuf **);
@@ -209,11 +211,13 @@ static void ip_forward(struct mbuf *m, int srcrt)
struct rtentry *rt; struct rtentry *rt;
struct mbuf *mcopy; struct mbuf *mcopy;
n_long dest; n_long dest;
int code, type, error = 0; int code, type, error;
struct ifnet *destifp = NULL; struct ifnet *destifp;
memset(sin, 0, sizeof(*sin));
dest = 0; dest = 0;
code = type = error = 0;
sin = NULL;
destifp = NULL;
if (m->m_flags & M_BCAST || in_canforward(ip->ip_dst) == 0) { if (m->m_flags & M_BCAST || in_canforward(ip->ip_dst) == 0) {
ipstat.ips_cantforward++; ipstat.ips_cantforward++;
m_freem(m); m_freem(m);
@@ -354,7 +358,7 @@ printf("ip_dooptions\n");
break; break;
} }
off--; off--;
if (off > optlen - sizeof(struct in_addr)) { if (off > (int) (optlen - sizeof(struct in_addr))) {
save_rte(cp, ip->ip_src); save_rte(cp, ip->ip_src);
break; break;
} }
@@ -380,7 +384,7 @@ printf("ip_dooptions\n");
goto bad; goto bad;
} }
off--; off--;
if (off > optlen - sizeof(struct in_addr)) if (off > (int) (optlen - sizeof(struct in_addr)))
break; break;
memcpy(&ipaddr.sin_addr, &ip->ip_dst, sizeof(ipaddr.sin_addr)); memcpy(&ipaddr.sin_addr, &ip->ip_dst, sizeof(ipaddr.sin_addr));
if ((ia = (INA)ifa_ifwithaddr((SA)&ipaddr)) == NULL && if ((ia = (INA)ifa_ifwithaddr((SA)&ipaddr)) == NULL &&
@@ -656,12 +660,12 @@ void ipv4_input(struct mbuf *m, int hdrlen)
/* Figure out of header length */ /* Figure out of header length */
hlen = ip->ip_hl << 2; hlen = ip->ip_hl << 2;
/* Check we're at least the minimum possible length */ /* Check we're at least the minimum possible length */
if (hlen < sizeof(struct ip)) { if (hlen < (int) sizeof(struct ip)) {
ipstat.ips_badhlen++; ipstat.ips_badhlen++;
goto bad; goto bad;
} }
/* Check again we have the entire header in the first mbuf */ /* Check again we have the entire header in the first mbuf */
if (hlen > m->m_len) { if (hlen > (int) m->m_len) {
if ((m = m_pullup(m, hlen)) == NULL) { if ((m = m_pullup(m, hlen)) == NULL) {
ipstat.ips_badhlen++; ipstat.ips_badhlen++;
goto bad; goto bad;
@@ -694,7 +698,7 @@ void ipv4_input(struct mbuf *m, int hdrlen)
/* Strip excess data from mbuf */ /* Strip excess data from mbuf */
if (m->m_pkthdr.len > ip->ip_len) { if (m->m_pkthdr.len > ip->ip_len) {
if (m->m_len == m->m_pkthdr.len) { if (m->m_pkthdr.len == (int) m->m_len) {
m->m_len = ip->ip_len; m->m_len = ip->ip_len;
m->m_pkthdr.len = ip->ip_len; m->m_pkthdr.len = ip->ip_len;
} else } else
@@ -703,7 +707,7 @@ void ipv4_input(struct mbuf *m, int hdrlen)
/* options processing */ /* options processing */
ip_nhops = 0; ip_nhops = 0;
if (hlen > sizeof(struct ip) && ip_dooptions(m)) if (hlen > (int) (sizeof(struct ip)) && ip_dooptions(m))
return; return;
for (ia = ip_ifaddr;ia; ia = ia->ia_next) { for (ia = ip_ifaddr;ia; ia = ia->ia_next) {
@@ -968,7 +972,7 @@ static int ipv4_output(struct mbuf *m0, struct mbuf *opt, struct route *ro,
m->m_data += get_max_linkhdr(); m->m_data += get_max_linkhdr();
mhip = mtod(m, struct ip*); mhip = mtod(m, struct ip*);
*mhip = *ip; *mhip = *ip;
if (hlen > sizeof(struct ip)) { if (hlen > (int) sizeof(struct ip)) {
mhlen = ip_optcopy(ip, mhip) + sizeof(struct ip); mhlen = ip_optcopy(ip, mhip) + sizeof(struct ip);
mhip->ip_hl = mhlen >> 2; mhip->ip_hl = mhlen >> 2;
} }
@@ -1030,7 +1034,7 @@ bad:
goto done; goto done;
} }
uint16 get_ip_id(void) static uint16 get_ip_id(void)
{ {
return (uint16) atomic_add(&ip_id, 1); return (uint16) atomic_add(&ip_id, 1);
} }