[Olsr-cvs] olsrd-current/src net_olsr.h,1.17,1.18

[Bernd Petrovitsch]

Update of /cvsroot/olsrd/olsrd-current/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25299/src

Modified Files:
	net_olsr.h 
Log Message:
* fixed bug: ip4cmp() was severly broken

Index: net_olsr.h
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/net_olsr.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** net_olsr.h	18 Nov 2007 20:01:08 -0000	1.17
--- net_olsr.h	25 Nov 2007 21:23:29 -0000	1.18
***************
*** 61,65 ****
   * Macros for comparing and copying IP addresses
   */
! static INLINE int ip4cmp(const struct in_addr *a, const struct in_addr *b) { return ntohl(a->s_addr) - ntohl(b->s_addr); }
  static INLINE int ip4equal(const struct in_addr *a, const struct in_addr *b) { return a->s_addr == b->s_addr; }
  
--- 61,65 ----
   * Macros for comparing and copying IP addresses
   */
! static INLINE int ip4cmp(const struct in_addr *a, const struct in_addr *b) { return a->s_addr > b->s_addr ? +1 : a->s_addr < b->s_addr ? -1 : 0; }
  static INLINE int ip4equal(const struct in_addr *a, const struct in_addr *b) { return a->s_addr == b->s_addr; }