Merge pull request #595 from buytenh/pcap_protocol

[libpcap] / pcap-linux.c

diff --git a/pcap-linux.c b/pcap-linux.c
index e4f0637df560c383490687b0104920eda2f7637b..9934c5e1ddd7d10909ee1b0194e9b86fc1e7b7bd 100644 (file)
--- a/pcap-linux.c
+++ b/pcap-linux.c
@@ -113,7 +113,7 @@
 #define _GNU_SOURCE
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <errno.h>
@@ -3317,6 +3317,13 @@ static void map_arphrd_to_dlt(pcap_t *handle, int sock_fd, int arptype,
                /* handlep->cooked = 1; */
                break;
 
+#ifndef ARPHRD_VSOCKMON
+#define ARPHRD_VSOCKMON        826
+#endif
+       case ARPHRD_VSOCKMON:
+               handle->linktype = DLT_VSOCK;
+               break;
+
        default:
                handle->linktype = -1;
                break;
@@ -4498,24 +4505,24 @@ pcap_cleanup_linux_mmap( pcap_t *handle )
 
 
 static int
-pcap_getnonblock_mmap(pcap_t *p)
+pcap_getnonblock_mmap(pcap_t *handle)
 {
-       struct pcap_linux *handlep = p->priv;
+       struct pcap_linux *handlep = handle->priv;
 
        /* use negative value of timeout to indicate non blocking ops */
        return (handlep->timeout<0);
 }
 
 static int
-pcap_setnonblock_mmap(pcap_t *p, int nonblock)
+pcap_setnonblock_mmap(pcap_t *handle, int nonblock)
 {
-       struct pcap_linux *handlep = p->priv;
+       struct pcap_linux *handlep = handle->priv;
 
        /*
         * Set the file descriptor to non-blocking mode, as we use
         * it for sending packets.
         */
-       if (pcap_setnonblock_fd(p, nonblock) == -1)
+       if (pcap_setnonblock_fd(handle, nonblock) == -1)
                return -1;
 
        /*