[Olsr-cvs] olsrd-current/src/unix ifnet.c,1.31,1.31.2.1

[Andreas T�nnesen]

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

Modified Files:
      Tag: olsrd_04
	ifnet.c 
Log Message:
Ported changes from head to 0.4

Index: ifnet.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/unix/ifnet.c,v
retrieving revision 1.31
retrieving revision 1.31.2.1
diff -C2 -d -r1.31 -r1.31.2.1
*** ifnet.c	29 Dec 2005 18:37:16 -0000	1.31
--- ifnet.c	11 Apr 2006 18:48:37 -0000	1.31.2.1
***************
*** 311,315 ****
  	  
  	  if(memcmp(&main_addr, 
! 		    &((struct sockaddr_in *)&ifp->int_addr)->sin_addr.s_addr, 
  		    ipsize) == 0)
  	    {
--- 311,315 ----
  	  
  	  if(memcmp(&main_addr, 
! 		    &((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr, 
  		    ipsize) == 0)
  	    {
***************
*** 317,321 ****
  	      olsr_syslog(OLSR_LOG_INFO, "New main address: %s\n", sockaddr_to_string(&ifr.ifr_addr));
  	      memcpy(&main_addr, 
! 		     &((struct sockaddr_in *)&ifp->int_addr)->sin_addr.s_addr, 
  		     ipsize);
  	    }
--- 317,321 ----
  	      olsr_syslog(OLSR_LOG_INFO, "New main address: %s\n", sockaddr_to_string(&ifr.ifr_addr));
  	      memcpy(&main_addr, 
! 		     &((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr, 
  		     ipsize);
  	    }
***************
*** 323,327 ****
  	  ifp->int_addr = ifr.ifr_addr;
  	  memcpy(&ifp->ip_addr, 
! 		 &((struct sockaddr_in *)&ifp->int_addr)->sin_addr.s_addr, 
  		 ipsize);
  
--- 323,327 ----
  	  ifp->int_addr = ifr.ifr_addr;
  	  memcpy(&ifp->ip_addr, 
! 		 &((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr, 
  		 ipsize);