[Olsr-cvs] olsrd-current/src/unix ifnet.c,1.43,1.44

[Bernd Petrovitsch]

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

Modified Files:
	ifnet.c 
Log Message:
* added the rest if the olsrd-fixes-eric patch from Sven-Ola


Index: ifnet.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/unix/ifnet.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** ifnet.c	4 Feb 2007 23:36:35 -0000	1.43
--- ifnet.c	10 Feb 2007 19:27:33 -0000	1.44
***************
*** 328,334 ****
  	  OLSR_PRINTF(1, "\tOld:%s\n", sockaddr_to_string(&ifp->int_addr))
  	  OLSR_PRINTF(1, "\tNew:%s\n", sockaddr_to_string(&ifr.ifr_addr))
! 	  
  	  if(memcmp(&olsr_cnf->main_addr, 
! 		    &((struct sockaddr_in *)&ifp->int_addr)->sin_addr.s_addr, 
  		    olsr_cnf->ipsize) == 0)
  	    {
--- 328,336 ----
  	  OLSR_PRINTF(1, "\tOld:%s\n", sockaddr_to_string(&ifp->int_addr))
  	  OLSR_PRINTF(1, "\tNew:%s\n", sockaddr_to_string(&ifr.ifr_addr))
! 
! 	  ifp->int_addr = ifr.ifr_addr;
! 
  	  if(memcmp(&olsr_cnf->main_addr, 
! 		    &ifp->ip_addr,
  		    olsr_cnf->ipsize) == 0)
  	    {
***************
*** 340,344 ****
  	    }
  
- 	  ifp->int_addr = ifr.ifr_addr;
  	  memcpy(&ifp->ip_addr, 
  		 &((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr, 
--- 342,345 ----