From Paolo Abeni and me: split pcap_open_live() into a "get a pcap_t

[libpcap] / pcap-dos.c

diff --git a/pcap-dos.c b/pcap-dos.c
index 426a4fd9ed5dbd2af32aaee9f8406e6e4598474a..391f8cd425d31e4fd26a0fe19deb578dae6b626f 100644 (file)
--- a/pcap-dos.c
+++ b/pcap-dos.c
@@ -5,7 +5,7 @@
  *  pcap-dos.c: Interface to PKTDRVR, NDIS2 and 32-bit pmode
  *              network drivers.
  *
  *  pcap-dos.c: Interface to PKTDRVR, NDIS2 and 32-bit pmode
  *              network drivers.
  *

- * @(#) $Header: /tcpdump/master/libpcap/pcap-dos.c,v 1.3 2007-12-05 23:37:26 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/pcap-dos.c,v 1.4 2008-04-04 19:37:45 guy Exp $ (LBL)

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>


@@ -97,6 +97,7 @@ static volatile BOOL exc_occured = 0;
 
 static struct device *handle_to_device [20];
 
 
 static struct device *handle_to_device [20];
 

+static void pcap_activate_dos (pcap_t *p);

 static int  pcap_read_dos (pcap_t *p, int cnt, pcap_handler callback,
                            u_char *data);
 static void pcap_close_dos (pcap_t *p);
 static int  pcap_read_dos (pcap_t *p, int cnt, pcap_handler callback,
                            u_char *data);
 static void pcap_close_dos (pcap_t *p);


@@ -142,59 +143,68 @@ static struct device *get_device (int fd)
   return handle_to_device [fd-1];
 }
 
   return handle_to_device [fd-1];
 }
 

+pcap_t *pcap_create (const char *device, char *ebuf)
+{
+       pcap_t *p;
+
+       p = pcap_create_common(device, ebuf);
+       if (p == NULL)
+               return (NULL);
+
+       p->activate_op = pcap_activate_dos;
+       return (p);
+}
+

 /*
  * Open MAC-driver with name 'device_name' for live capture of
  * network packets.
  */
 /*
  * Open MAC-driver with name 'device_name' for live capture of
  * network packets.
  */

-pcap_t *pcap_open_live (const char *device_name, int snaplen, int promisc,
-                        int timeout_ms, char *errbuf)
+static int pcap_activate_dos (pcap_t *pcap)

 { 
 { 

-  struct pcap *pcap;
+  int err = 0;

 
 

-  if (snaplen < ETH_MIN)
-      snaplen = ETH_MIN;
+  if (p->opt.rfmon) {
+    /*
+     * No monitor mode on DOS.
+     */
+    return (PCAP_ERROR_RFMON_NOTSUP);
+  }

 
 

-  if (snaplen > ETH_MAX)   /* silently accept and truncate large MTUs */
-      snaplen = ETH_MAX;
+  if (pcap->snapshot < ETH_MIN+8)
+      pcap->snapshot = ETH_MIN+8;

 
 

-  pcap = calloc (sizeof(*pcap), 1);
-  if (!pcap)
-  {
-    strcpy (errbuf, "Not enough memory (pcap)");
-    return (NULL);
-  }
+  if (pcap->snapshot > ETH_MAX)   /* silently accept and truncate large MTUs */
+      pcap->snapshot = ETH_MAX;

 
 

-  pcap->snapshot          = max (ETH_MIN+8, snaplen);

   pcap->linktype          = DLT_EN10MB;  /* !! */
   pcap->linktype          = DLT_EN10MB;  /* !! */

-  pcap->inter_packet_wait = timeout_ms;

   pcap->close_op          = pcap_close_dos;
   pcap->read_op           = pcap_read_dos;
   pcap->stats_op          = pcap_stats_dos;
   pcap->inject_op         = pcap_sendpacket_dos;
   pcap->setfilter_op      = pcap_setfilter_dos;
   pcap->close_op          = pcap_close_dos;
   pcap->read_op           = pcap_read_dos;
   pcap->stats_op          = pcap_stats_dos;
   pcap->inject_op         = pcap_sendpacket_dos;
   pcap->setfilter_op      = pcap_setfilter_dos;

-       pcap->setdirection_op   = NULL; /* Not implemented.*/
+  pcap->setdirection_op   = NULL; /* Not implemented.*/

   pcap->fd                = ++ref_count;
 
   if (pcap->fd == 1)  /* first time we're called */
   {
   pcap->fd                = ++ref_count;
 
   if (pcap->fd == 1)  /* first time we're called */
   {

-    if (!init_watt32(pcap, device_name, errbuf) ||
-        !first_init(device_name, errbuf, promisc))
+    if (!init_watt32(pcap, pcap->md.device, pcap->errbuf) ||
+        !first_init(pcap->md.device, pcap->errbuf, pcap->opt.promisc))

     {
       free (pcap);
     {
       free (pcap);

-      return (NULL);
+      return (PCAP_ERROR);

     } 
     atexit (close_driver);
   }
     } 
     atexit (close_driver);
   }

-  else if (stricmp(active_dev->name,device_name))
+  else if (stricmp(active_dev->name,pcap->md.device))

   {
   {

-    snprintf (errbuf, PCAP_ERRBUF_SIZE,
+    snprintf (pcap->errbuf, PCAP_ERRBUF_SIZE,

               "Cannot use different devices simultaneously "
               "Cannot use different devices simultaneously "

-              "(`%s' vs. `%s')", active_dev->name, device_name);
+              "(`%s' vs. `%s')", active_dev->name, pcap->md.device);

     free (pcap);
     free (pcap);

-    pcap = NULL;
+    err = PCAP_ERROR;

   }
   handle_to_device [pcap->fd-1] = active_dev;
   }
   handle_to_device [pcap->fd-1] = active_dev;

-  return (pcap);
+  return (err);

 }
 
 /*
 }
 
 /*


@@ -209,10 +219,10 @@ pcap_read_one (pcap_t *p, pcap_handler callback, u_char *data)
   BYTE  *rx_buf;
   int    rx_len = 0;
 
   BYTE  *rx_buf;
   int    rx_len = 0;
 

-  if (p->inter_packet_wait > 0)
+  if (p->md.timeout > 0)

   {
     gettimeofday2 (&now, NULL);
   {
     gettimeofday2 (&now, NULL);

-    expiry.tv_usec = now.tv_usec + 1000UL * p->inter_packet_wait;
+    expiry.tv_usec = now.tv_usec + 1000UL * p->md.timeout;

     expiry.tv_sec  = now.tv_sec;
     while (expiry.tv_usec >= 1000000L)
     {
     expiry.tv_sec  = now.tv_sec;
     while (expiry.tv_usec >= 1000000L)
     {


@@ -284,7 +294,7 @@ pcap_read_one (pcap_t *p, pcap_handler callback, u_char *data)
     /* If not to wait for a packet or pcap_close() called from
      * e.g. SIGINT handler, exit loop now.
      */
     /* If not to wait for a packet or pcap_close() called from
      * e.g. SIGINT handler, exit loop now.
      */

-    if (p->inter_packet_wait <= 0 || (volatile int)p->fd <= 0)
+    if (p->md.timeout <= 0 || (volatile int)p->fd <= 0)

        break;
 
     gettimeofday2 (&now, NULL);
        break;
 
     gettimeofday2 (&now, NULL);


@@ -476,7 +486,7 @@ int pcap_lookupnet (const char *device, bpf_u_int32 *localnet,
 {
   if (!_watt_is_init)
   {
 {
   if (!_watt_is_init)
   {

-    strcpy (errbuf, "pcap_open_offline() or pcap_open_live() must be "
+    strcpy (errbuf, "pcap_open_offline() or pcap_activate() must be "

                     "called first");
     return (-1);
   }
                     "called first");
     return (-1);
   }


@@ -587,7 +597,7 @@ void pcap_set_wait (pcap_t *p, void (*yield)(void), int wait)
   if (p)
   {
     p->wait_proc         = yield;
   if (p)
   {
     p->wait_proc         = yield;

-    p->inter_packet_wait = wait;
+    p->md.timeout        = wait;

   }
 }
 
   }
 }
 


@@ -739,7 +749,7 @@ static void exc_handler (int sig)
 
 
 /*
 
 
 /*

- * Open the pcap device for the first client calling pcap_open_live()
+ * Open the pcap device for the first client calling pcap_activate()

  */
 static int first_init (const char *name, char *ebuf, int promisc)
 {
  */
 static int first_init (const char *name, char *ebuf, int promisc)
 {