[Olsr-cvs] olsrd-current/src/bsd kernel_routes.c, 1.6, 1.7 net.c, 1.26, 1.27

[Andreas T�nnesen]

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

Modified Files:
	kernel_routes.c net.c 
Log Message:
Cleanup in use of extern variables. Rather trivial changes, but a lot of them

Index: net.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/bsd/net.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** net.c	28 Aug 2005 19:30:29 -0000	1.26
--- net.c	7 Jan 2006 08:16:22 -0000	1.27
***************
*** 720,724 ****
    ifr.ifr_data = (caddr_t)&wreq;
  
!   return (ioctl(ioctl_s, SIOCGWAVELAN, &ifr) >= 0) ? 1 : 0;
  #else
    return 0;
--- 720,724 ----
    ifr.ifr_data = (caddr_t)&wreq;
  
!   return (ioctl(olsr_cnf->ioctl_s, SIOCGWAVELAN, &ifr) >= 0) ? 1 : 0;
  #else
    return 0;
***************
*** 746,750 ****
        strlcpy(ifm.ifm_name, ifname, sizeof(ifm.ifm_name));
  
!       if(ioctl(ioctl_s, SIOCGIFMEDIA, &ifm) < 0)
  	{
  	  OLSR_PRINTF(1, "Error SIOCGIFMEDIA(%s)\n", ifm.ifm_name)
--- 746,750 ----
        strlcpy(ifm.ifm_name, ifname, sizeof(ifm.ifm_name));
  
!       if(ioctl(olsr_cnf->ioctl_s, SIOCGIFMEDIA, &ifm) < 0)
  	{
  	  OLSR_PRINTF(1, "Error SIOCGIFMEDIA(%s)\n", ifm.ifm_name)

Index: kernel_routes.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/bsd/kernel_routes.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** kernel_routes.c	27 Feb 2005 10:43:38 -0000	1.6
--- kernel_routes.c	7 Jan 2006 08:16:22 -0000	1.7
***************
*** 153,157 ****
    rtm->rtm_msglen = (unsigned short)(walker - buff);
  
!   len = write(rts, buff, rtm->rtm_msglen);
  
    if (len < rtm->rtm_msglen)
--- 153,157 ----
    rtm->rtm_msglen = (unsigned short)(walker - buff);
  
!   len = write(olsr_cnf->rts, buff, rtm->rtm_msglen);
  
    if (len < rtm->rtm_msglen)