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

[Bernd Petrovitsch]

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

Modified Files:
	ifnet.c 
Log Message:
* killed if_nr in struct interface and index in struct olsr_if.
  Kudos to Jörg Pommnitz <(spam-protected)> for spotting this
  leftovers and a patch for the Unix part.


Index: ifnet.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/win32/ifnet.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** ifnet.c	1 May 2007 21:50:41 -0000	1.37
--- ifnet.c	13 May 2007 22:23:55 -0000	1.38
***************
*** 114,118 ****
  void WinSockPError(char *);
  char *StrError(unsigned int ErrNo);
- int inet_pton(int af, const char *src, void *dst);
  
  void ListInterfaces(void);
--- 114,117 ----
***************
*** 626,631 ****
    OLSR_PRINTF(1, "       Address:%s\n", olsr_ip_to_string(&iface->hemu_ip));
  
-   OLSR_PRINTF(1, "       Index:%d\n", iface->index);
- 
    OLSR_PRINTF(1, "       NB! This is a emulated interface\n       that does not exist in the kernel!\n");
  
--- 625,628 ----
***************
*** 640,646 ****
      }
  
-   /* setting the interfaces number*/
-   ifp->if_nr = iface->index;
- 
    ifp->int_mtu = OLSR_DEFAULT_MTU;
  
--- 637,640 ----
***************
*** 984,989 ****
    strcpy(New->int_name, IntConf->name);
  
-   New->if_nr = IntConf->index;
- 
    IsWlan = IsWireless(IntConf->name);
  
--- 978,981 ----
***************
*** 1004,1008 ****
      
    OLSR_PRINTF(1, "\tInterface %s set up for use with index %d\n\n",
!               IntConf->name, New->if_nr);
        
    OLSR_PRINTF(1, "\tMTU: %d\n", New->int_mtu);
--- 996,1000 ----
      
    OLSR_PRINTF(1, "\tInterface %s set up for use with index %d\n\n",
!               IntConf->name, New->if_index);
        
    OLSR_PRINTF(1, "\tMTU: %d\n", New->int_mtu);