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

[Bernd Petrovitsch]

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

Modified Files:
	ifnet.c 
Log Message:
* killed USE_LIBNET

Index: ifnet.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/unix/ifnet.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** ifnet.c	10 Feb 2007 19:27:33 -0000	1.44
--- ifnet.c	10 Feb 2007 19:59:51 -0000	1.45
***************
*** 69,76 ****
  #include <unistd.h>
  
- #ifdef USE_LIBNET
- #include <libnet.h>
- #endif
- 
  int bufspace = 127*1024;	/* max. input buffer size to request */
  
--- 69,72 ----
***************
*** 507,513 ****
    close(ifp->olsr_socket);
    remove_olsr_socket(ifp->olsr_socket, &olsr_input);
- #ifdef USE_LIBNET
-   libnet_destroy(ifp->libnet_ctx);
- #endif
  
    /* Free memory */
--- 503,506 ----
***************
*** 932,938 ****
    memcpy(ifp, &ifs, sizeof(struct interface));
    
- #ifdef USE_LIBNET
-   ifp->libnet_ctx = NULL;  
- #endif
    ifp->gen_properties = NULL;
    ifp->int_name = olsr_malloc(strlen(ifr.ifr_name) + 1, "Interface update 3");
--- 925,928 ----
***************
*** 990,1010 ****
      }
  
- #ifdef USE_LIBNET
- #if 1
-   ifp->libnet_ctx = libnet_init((olsr_cnf->ip_version == AF_INET) ? 
- 				LIBNET_RAW4 : LIBNET_RAW6, 
- 				ifp->int_name, get_libnet_errbuf());
- #else
-   ifp->libnet_ctx = libnet_init(LIBNET_LINK, ifp->int_name, get_libnet_errbuf());
- #endif
- 
-   if(ifp->libnet_ctx == NULL)
-     {
-       fprintf(stderr, "Could not initialize libnet... exiting!\n\n");
-       olsr_syslog(OLSR_LOG_ERR, "Could not initialize libnet... exiting!\n\n");
-       olsr_cnf->exit_value = EXIT_FAILURE;
-       kill(getpid(), SIGINT);
-     }
- #endif
    set_buffer_timer(ifp);
  
--- 980,983 ----