[Olsr-cvs] olsrd-current/src/win32 ifnet.c,1.38,1.39

Bernd Petrovitsch (spam-protected)
Thu Nov 8 23:47:45 CET 2007

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

Modified Files:
Log Message:
Another fat commit:

The main target was:
- Fixed the misleading definition of "v4" in "struct olsr_ip_addr" fom
  "olsr_u32_t" (in network-byteorder!) to "struct in_addr". Lots of
  temporary variables to call inet_ntoa()/inet_ptoa() vanished .....
- declare "int_addr", "int_netmask" and "int_broadaddr" in "struct interface"
  as "struct sockaddr_in" since it is that what we actually want there (and
  it is similar to the IPv6 code).

To get that thoroughly via compiler errors, we get:
- We have now ip4_to_string(), ip6_to_string() and olsr_ip_to_string()
  to print a "struct in_addr", "struct in6_addr" and "union olsr_ip_addr"
  into a string buffer.

Alas, this also annoyed me since ages:
- cleanup: olsr_ip_to_string() and similar non-reentrant functions now must
  get a target buffer. To ease that, there is the "struct ipaddr_str"
  which is large enough for all of them (read: for an IPv6 address). This
  also removes the cyclic buffer there.
  All of these function return a "const char *" which can be directly used
  for printf(3) and friends.

And some cleanups:
- const'ified more functions
- converted the source to UTF-8.
- "struct sig_msg" uses an olsr_u8_t for a byte array (and not "char")
- force the few inline function to always be inlined.
- #ifdef the body of the olsr_print_hna_set() and olsr_print_neighbor_table()
  if nothing is done
- use "inline_avl_comp_ipv4()" in "avl_comp_ipv4()"
- clean up the routes on more signals. Basically we want to do this on all
  signals which terminate the program.
- killed a superflous global buffer in src/main.c

This version was breing since weeks and running for severa day in Vienna's
FunkFeuer net without any noticably problem!

Please report anything that broke!

Index: ifnet.c
RCS file: /cvsroot/olsrd/olsrd-current/src/win32/ifnet.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** ifnet.c	13 May 2007 22:23:55 -0000	1.38
--- ifnet.c	8 Nov 2007 22:47:43 -0000	1.39
*** 535,539 ****
!   if(COMP_IP(&olsr_cnf->main_addr, &Int->ip_addr))
      if(ifnet == NULL)
--- 535,539 ----
!   if(ipequal(&olsr_cnf->main_addr, &Int->ip_addr))
      if(ifnet == NULL)
*** 631,635 ****
    memset(&null_addr, 0, olsr_cnf->ipsize);
!   if(COMP_IP(&null_addr, &olsr_cnf->main_addr))
        COPY_IP(&olsr_cnf->main_addr, &iface->hemu_ip);
--- 631,635 ----
    memset(&null_addr, 0, olsr_cnf->ipsize);
!   if(ipequal(&null_addr, &olsr_cnf->main_addr))
        COPY_IP(&olsr_cnf->main_addr, &iface->hemu_ip);
*** 1035,1039 ****
    memset(&NullAddr, 0, olsr_cnf->ipsize);
!   if(COMP_IP(&NullAddr, &olsr_cnf->main_addr))
      COPY_IP(&olsr_cnf->main_addr, &New->ip_addr);
--- 1035,1039 ----
    memset(&NullAddr, 0, olsr_cnf->ipsize);
!   if(ipequal(&NullAddr, &olsr_cnf->main_addr))
      COPY_IP(&olsr_cnf->main_addr, &New->ip_addr);

More information about the Olsr-cvs mailing list