[Olsr-cvs] olsrd-current/src/win32 ifnet.c, 1.40, 1.41 net.c, 1.23, 1.24

[Bernd Petrovitsch]

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

Modified Files:
	ifnet.c net.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/win32/ifnet.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** ifnet.c	8 Nov 2007 23:23:13 -0000	1.40
--- ifnet.c	29 Nov 2007 18:10:18 -0000	1.41
***************
*** 549,553 ****
      {
        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));
--- 549,552 ----
***************
*** 639,643 ****
    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));
--- 638,641 ----
***************
*** 1044,1048 ****
    if(ipequal(&NullAddr, &olsr_cnf->main_addr))
    {
-     //COPY_IP(&olsr_cnf->main_addr, &New->ip_addr);
      olsr_cnf->main_addr = New->ip_addr;
      OLSR_PRINTF(1, "New main address: %s\n", olsr_ip_to_string(&buf, &olsr_cnf->main_addr));
--- 1042,1045 ----

Index: net.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/win32/net.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** net.c	8 Nov 2007 23:23:13 -0000	1.23
--- net.c	29 Nov 2007 18:10:18 -0000	1.24
***************
*** 342,346 ****
    struct ipv6_mreq McastReq;
  
-   //COPY_IP(&McastReq.ipv6mr_multiaddr, &Nic->int6_multaddr.sin6_addr);
    McastReq.ipv6mr_multiaddr = Nic->int6_multaddr.sin6_addr;
    McastReq.ipv6mr_interface = Nic->if_index;
--- 342,345 ----