rawsock -> ethsock

diff --git a/ethsock.c b/ethsock.c
new file mode 100644 (file)
index 0000000..97d2cb5
--- /dev/null
+++ b/ethsock.c
@@ -0,0 +1,142 @@
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <pcap.h>
+#include "ethsock.h"
+
+#ifndef MIN
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
+struct ethsock
+{
+       pcap_t *pcap;
+       struct timeval timeout;
+       int fd;
+};
+
+struct ethsock *ethsock_create(const char *interface, uint16_t protocol)
+{
+       char buf[PCAP_ERRBUF_SIZE];
+       struct bpf_program fp;
+       struct ethsock *sock;
+       int err;
+
+       sock = malloc(sizeof(struct ethsock));
+       if (!sock) {
+               perror("malloc");
+               return NULL;
+       }
+
+       buf[0] = '\0';
+
+       sock->pcap = pcap_open_live(interface, BUFSIZ, 1, 1, buf);
+       if (!sock->pcap) {
+               fprintf(stderr, "pcap_open_live: %s\n", buf);
+               goto cleanup_malloc;
+       }
+
+       if (*buf) {
+               fprintf(stderr, "Warning: %s.\n", buf);
+       }
+
+       if (pcap_datalink(sock->pcap) != DLT_EN10MB) {
+               fprintf(stderr, "Interface %s not supported.\n", interface);
+               goto cleanup_pcap;
+       }
+
+       sock->fd = pcap_get_selectable_fd(sock->pcap);
+       if (sock->fd == -1) {
+               fprintf(stderr, "No selectable file descriptor available.\n");
+               goto cleanup_pcap;
+       }
+
+       snprintf(buf, sizeof(buf), "ether proto %04x", protocol);
+       err = pcap_compile(sock->pcap, &fp, buf, 0, PCAP_NETMASK_UNKNOWN);
+       if (err) {
+               pcap_perror(sock->pcap, "pcap_compile");
+               goto cleanup_pcap;
+       }
+
+       if ((err = pcap_setfilter(sock->pcap, &fp))) {
+               pcap_perror(sock->pcap, "pcap_setfilter");
+               goto cleanup_pcap;
+       }
+
+       return sock;
+
+cleanup_pcap:
+       pcap_close(sock->pcap);
+cleanup_malloc:
+       free(sock);
+       return NULL;
+}
+
+ssize_t ethsock_recv(struct ethsock *sock, void *buf, size_t len)
+{
+       struct pcap_pkthdr* hdr;
+       const u_char *capbuf;
+       int status;
+       fd_set fds;
+
+       if (sock->timeout.tv_sec || sock->timeout.tv_usec) {
+               FD_ZERO(&fds);
+               FD_SET(sock->fd, &fds);
+
+               status = select(sock->fd + 1, &fds, NULL, NULL, &sock->timeout);
+               if (status == -1) {
+                       perror("select");
+                       return -1;
+               } else if (status == 0) {
+                       return 1;
+               }
+       }
+
+       status = pcap_next_ex(sock->pcap, &hdr, &capbuf);
+       switch (status) {
+               case 1:
+                       memcpy(buf, capbuf, MIN(len, hdr->caplen));
+                       return hdr->caplen;
+               case 0:
+                       return 0;
+               case -1:
+                       pcap_perror(sock->pcap, "pcap_next_ex");
+                       return -1;
+               default:
+                       fprintf(stderr, "pcap_next_ex: returned %d.\n", status);
+                       return -1;
+       }
+}
+
+int ethsock_send(struct ethsock *sock, void *buf, size_t len)
+{
+#if defined(_WIN32) || defined(_WIN64)
+       if (pcap_sendpacket(sock->pcap, buf, len) == 0) {
+               return 0;
+       } else {
+               pcap_perror(sock->pcap, "pcap_sendpacket");
+               return -1;
+       }
+#else
+       if (pcap_inject(sock->pcap, buf, len) == len) {
+               return 0;
+       } else {
+               pcap_perror(sock->pcap, "pcap_inject");
+               return -1;
+       }
+#endif
+}
+
+int ethsock_close(struct ethsock *sock)
+{
+       pcap_close(sock->pcap);
+       free(sock);
+       return 0;
+}
+
+int ethsock_set_timeout(struct ethsock *sock, unsigned msec)
+{
+       sock->timeout.tv_sec = msec / 1000;
+       sock->timeout.tv_usec = (msec % 1000) * 1000;
+       return 0;
+}

diff --git a/ethsock.h b/ethsock.h
new file mode 100644 (file)
index 0000000..458a2d5
--- /dev/null
+++ b/ethsock.h
@@ -0,0 +1,9 @@
+#include <stdint.h>
+
+struct ethsock;
+
+struct ethsock *ethsock_create(const char *interface, uint16_t protocol);
+int ethsock_close(struct ethsock *sock);
+int ethsock_send(struct ethsock *sock, void *buf, size_t len);
+ssize_t ethsock_recv(struct ethsock *sock, void *buf, size_t len);
+int ethsock_set_timeout(struct ethsock *sock, unsigned msec);

diff --git a/rawsock.c b/rawsock.c
deleted file mode 100644 (file)
index 6b30f78..0000000
--- a/rawsock.c
+++ /dev/null
@@ -1,141 +0,0 @@
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <pcap.h>
-
-#ifndef MIN
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-#endif
-
-struct rawsock
-{
-       pcap_t *pcap;
-       struct timeval timeout;
-       int fd;
-};
-
-struct rawsock *rawsock_create(const char *interface, uint16_t protocol)
-{
-       char buf[PCAP_ERRBUF_SIZE];
-       struct bpf_program fp;
-       struct rawsock *sock;
-       int err;
-
-       sock = malloc(sizeof(struct rawsock));
-       if (!sock) {
-               perror("malloc");
-               return NULL;
-       }
-
-       buf[0] = '\0';
-
-       sock->pcap = pcap_open_live(interface, BUFSIZ, 1, 1, buf);
-       if (!sock->pcap) {
-               fprintf(stderr, "pcap_open_live: %s\n", buf);
-               goto cleanup_malloc;
-       }
-
-       if (*buf) {
-               fprintf(stderr, "Warning: %s.\n", buf);
-       }
-
-       if (pcap_datalink(sock->pcap) != DLT_EN10MB) {
-               fprintf(stderr, "Interface %s not supported.\n", interface);
-               goto cleanup_pcap;
-       }
-
-       sock->fd = pcap_get_selectable_fd(sock->pcap);
-       if (sock->fd == -1) {
-               fprintf(stderr, "No selectable file descriptor available.\n");
-               goto cleanup_pcap;
-       }
-
-       snprintf(buf, sizeof(buf), "ether proto %04x", protocol);
-       err = pcap_compile(sock->pcap, &fp, buf, 0, PCAP_NETMASK_UNKNOWN);
-       if (err) {
-               pcap_perror(sock->pcap, "pcap_compile");
-               goto cleanup_pcap;
-       }
-
-       if ((err = pcap_setfilter(sock->pcap, &fp))) {
-               pcap_perror(sock->pcap, "pcap_setfilter");
-               goto cleanup_pcap;
-       }
-
-       return sock;
-
-cleanup_pcap:
-       pcap_close(sock->pcap);
-cleanup_malloc:
-       free(sock);
-       return NULL;
-}
-
-ssize_t rawsock_recv(struct rawsock *sock, void *buf, size_t len)
-{
-       struct pcap_pkthdr* hdr;
-       const u_char *capbuf;
-       int status;
-       fd_set fds;
-
-       if (sock->timeout.tv_sec || sock->timeout.tv_usec) {
-               FD_ZERO(&fds);
-               FD_SET(sock->fd, &fds);
-
-               status = select(sock->fd + 1, &fds, NULL, NULL, &sock->timeout);
-               if (status == -1) {
-                       perror("select");
-                       return -1;
-               } else if (status == 0) {
-                       return 1;
-               }
-       }
-
-       status = pcap_next_ex(sock->pcap, &hdr, &capbuf);
-       switch (status) {
-               case 1:
-                       memcpy(buf, capbuf, MIN(len, hdr->caplen));
-                       return hdr->caplen;
-               case 0:
-                       return 0;
-               case -1:
-                       pcap_perror(sock->pcap, "pcap_next_ex");
-                       return -1;
-               default:
-                       fprintf(stderr, "pcap_next_ex: returned %d.\n", status);
-                       return -1;
-       }
-}
-
-int rawsock_send(struct rawsock *sock, void *buf, size_t len)
-{
-#if defined(_WIN32) || defined(_WIN64)
-       if (pcap_sendpacket(sock->pcap, buf, len) == 0) {
-               return 0;
-       } else {
-               pcap_perror(sock->pcap, "pcap_sendpacket");
-               return -1;
-       }
-#else
-       if (pcap_inject(sock->pcap, buf, len) == len) {
-               return 0;
-       } else {
-               pcap_perror(sock->pcap, "pcap_inject");
-               return -1;
-       }
-#endif
-}
-
-int rawsock_close(struct rawsock *sock)
-{
-       pcap_close(sock->pcap);
-       free(sock);
-       return 0;
-}
-
-int rawsock_set_timeout(struct rawsock *sock, unsigned msec)
-{
-       sock->timeout.tv_sec = msec / 1000;
-       sock->timeout.tv_usec = (msec % 1000) * 1000;
-       return 0;
-}

diff --git a/rawsock.h b/rawsock.h
deleted file mode 100644 (file)
index 2099b43..0000000
--- a/rawsock.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <stdint.h>
-
-struct rawsock;
-
-struct rawsock *rawsock_create(const char *interface, uint16_t protocol);
-int rawsock_close(struct rawsock *sock);
-int rawsock_send(struct rawsock *sock, void *buf, size_t len);
-ssize_t rawsock_recv(struct rawsock *sock, void *buf, size_t len);
-int rawsock_set_timeout(struct rawsock *sock, unsigned msec);