[Olsr-cvs] olsrd-current/src/unix ifnet.c,1.54,1.55

[Bernd Petrovitsch]

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

Modified Files:
	ifnet.c 
Log Message:
* removed the commented out COPY_IP() and COMP_IP() macros - everything seems to work

Index: ifnet.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/unix/ifnet.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** ifnet.c	29 Nov 2007 00:49:40 -0000	1.54
--- ifnet.c	29 Nov 2007 18:10:17 -0000	1.55
***************
*** 458,462 ****
  	{
            struct ipaddr_str buf;
- 	  //COPY_IP(&olsr_cnf->main_addr, &ifnet->ip_addr);
  	  olsr_cnf->main_addr = ifnet->ip_addr;
  	  OLSR_PRINTF(1, "New main address: %s\n", olsr_ip_to_string(&buf, &olsr_cnf->main_addr));
--- 458,461 ----
***************
*** 573,577 ****
    if(ipequal(&null_addr, &olsr_cnf->main_addr))
      {
-       //COPY_IP(&olsr_cnf->main_addr, &iface->hemu_ip);
        olsr_cnf->main_addr = iface->hemu_ip;
        OLSR_PRINTF(1, "New main address: %s\n", olsr_ip_to_string(&buf, &olsr_cnf->main_addr));
--- 572,575 ----
***************
*** 1031,1035 ****
      {
        struct ipaddr_str buf;
-       //COPY_IP(&olsr_cnf->main_addr, &ifp->ip_addr);
        olsr_cnf->main_addr = ifp->ip_addr;
        OLSR_PRINTF(1, "New main address: %s\n", olsr_ip_to_string(&buf, &olsr_cnf->main_addr));
--- 1029,1032 ----