From d51d6b2d89d9016168bf02d2fcea30d7cd8d33b3 Mon Sep 17 00:00:00 2001 From: goldsimon Date: Fri, 5 Feb 2010 10:08:49 +0000 Subject: [PATCH] Use macros to compare IP addresses --- src/netif/ppp/vj.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/netif/ppp/vj.c b/src/netif/ppp/vj.c index 6450d4ec..7aa12885 100644 --- a/src/netif/ppp/vj.c +++ b/src/netif/ppp/vj.c @@ -175,8 +175,8 @@ vj_compress_tcp(struct vjcompress *comp, struct pbuf *pb) * again & we don't have to do any reordering if it's used. */ INCR(vjs_packets); - if (ip->src.addr != cs->cs_ip.src.addr - || ip->dest.addr != cs->cs_ip.dest.addr + if (!ip_addr_cmp(&ip->src, &cs->cs_ip.src) + || !ip_addr_cmp(&ip->dest, &cs->cs_ip.dest) || *(long *)th != ((long *)&cs->cs_ip)[IPH_HL(&cs->cs_ip)]) { /* * Wasn't the first -- search for it. @@ -196,8 +196,8 @@ vj_compress_tcp(struct vjcompress *comp, struct pbuf *pb) do { lcs = cs; cs = cs->cs_next; INCR(vjs_searches); - if (ip->src.addr == cs->cs_ip.src.addr - && ip->dest.addr == cs->cs_ip.dest.addr + if (ip_addr_cmp(&ip->src, &cs->cs_ip.src) + && ip_addr_cmp(&ip->dest, &cs->cs_ip.dest) && *(long *)th == ((long *)&cs->cs_ip)[IPH_HL(&cs->cs_ip)]) { goto found; }