1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311
|
>From 0345076badd69b840777fbd3fdf2e0bdd77954db Mon Sep 17 00:00:00 2001
From: Richard Braun <rbraun@sceen.net>
Date: Thu, 10 Apr 2014 01:26:01 +0200
Subject: [PATCH] Debian GNU/Hurd (with NETDDE) support
---
configure.in | 6 ++
pcap-hurd.c | 255 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 261 insertions(+)
create mode 100644 pcap-hurd.c
--- a/configure.ac
+++ b/configure.ac
@@ -756,6 +756,7 @@
AC_CHECK_HEADERS(net/nit.h sys/net/nit.h)
AC_CHECK_HEADERS(linux/socket.h net/raw.h sys/dlpi.h)
AC_CHECK_HEADERS(config/HaikuConfig.h)
+ AC_CHECK_HEADERS(hurd.h)
if test "$ac_cv_lbl_bpf_h_defines_biocsetif" = yes; then
#
@@ -817,6 +818,11 @@
# Haiku.
#
V_PCAP=haiku
+ elif test "$ac_cv_header_hurd_h" = yes; then
+ #
+ # Hurd.
+ #
+ V_PCAP=hurd
else
#
# Nothing we support.
@@ -1144,6 +1150,11 @@
PLATFORM_C_SRC="pcap-snoop.c"
;;
+hurd)
+ PLATFORM_C_SRC="pcap-hurd.c"
+ LIBS="$LIBS -lrt"
+ ;;
+
dag)
#
# --with-pcap=dag is the only way to get here, and it means
--- /dev/null
+++ b/pcap-hurd.c
@@ -0,0 +1,263 @@
+#define _GNU_SOURCE
+
+/* XXX Hack not to include the Mach BPF interface */
+#define _DEVICE_BPF_H_
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <fcntl.h>
+#include <hurd.h>
+#include <mach.h>
+#include <time.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <device/device.h>
+#include <device/device_types.h>
+#include <device/net_status.h>
+#include <net/if_ether.h>
+
+#include "pcap-int.h"
+
+struct pcap_hurd {
+ struct pcap_stat stat;
+ device_t mach_dev;
+ mach_port_t rcv_port;
+};
+
+static struct bpf_insn filter[] = {
+ { NETF_IN | NETF_OUT | NETF_BPF, 0, 0, 0 },
+ { BPF_RET | BPF_K, 0, 0, 1500 },
+};
+
+#define FILTER_COUNT (sizeof(filter) / sizeof(short))
+
+static int
+pcap_read_hurd(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
+{
+ struct net_rcv_msg *msg;
+ struct pcap_hurd *ph;
+ struct pcap_pkthdr h;
+ struct timespec ts;
+ int ret, wirelen, caplen;
+ u_char *pkt;
+ kern_return_t kr;
+
+ ph = p->priv;
+ msg = (struct net_rcv_msg *)p->buffer;
+
+retry:
+ if (p->break_loop) {
+ p->break_loop = 0;
+ return PCAP_ERROR_BREAK;
+ }
+
+ kr = mach_msg(&msg->msg_hdr, MACH_RCV_MSG | MACH_RCV_INTERRUPT, 0,
+ p->bufsize, ph->rcv_port, MACH_MSG_TIMEOUT_NONE,
+ MACH_PORT_NULL);
+
+ if (kr) {
+ if (kr == MACH_RCV_INTERRUPTED)
+ goto retry;
+
+ snprintf(p->errbuf, sizeof(p->errbuf), "mach_msg: %s",
+ pcap_strerror(kr));
+ return PCAP_ERROR;
+ }
+
+ ph->stat.ps_recv++;
+
+ /* XXX Ethernet support only */
+ wirelen = ETH_HLEN + msg->net_rcv_msg_packet_count
+ - sizeof(struct packet_header);
+ pkt = p->buffer + offsetof(struct net_rcv_msg, packet)
+ + sizeof(struct packet_header) - ETH_HLEN;
+ memmove(pkt, p->buffer + offsetof(struct net_rcv_msg, header),
+ ETH_HLEN);
+
+ caplen = (wirelen > p->snapshot) ? p->snapshot : wirelen;
+ ret = bpf_filter(p->fcode.bf_insns, pkt, wirelen, caplen);
+
+ if (!ret)
+ goto out;
+
+ clock_gettime(CLOCK_REALTIME, &ts);
+ h.ts.tv_sec = ts.tv_sec;
+ h.ts.tv_usec = ts.tv_nsec / 1000;
+ h.len = wirelen;
+ h.caplen = caplen;
+ callback(user, &h, pkt);
+
+out:
+ return 1;
+}
+
+static int
+pcap_inject_hurd(pcap_t *p, const void *buf, int size)
+{
+ struct pcap_hurd *ph;
+ kern_return_t kr;
+ int count;
+
+ ph = p->priv;
+ kr = device_write(ph->mach_dev, D_NOWAIT, 0,
+ (io_buf_ptr_t)buf, size, &count);
+
+ if (kr) {
+ snprintf(p->errbuf, sizeof(p->errbuf), "device_write: %s",
+ pcap_strerror(kr));
+ return -1;
+ }
+
+ return count;
+}
+
+static int
+pcap_stats_hurd(pcap_t *p, struct pcap_stat *ps)
+{
+ struct pcap_hurd *ph;
+
+ ph = p->priv;
+ *ps = ph->stat;
+ return 0;
+}
+
+static void
+pcap_cleanup_hurd(pcap_t *p)
+{
+ struct pcap_hurd *ph;
+
+ ph = p->priv;
+
+ if (ph->rcv_port != MACH_PORT_NULL) {
+ mach_port_deallocate(mach_task_self(), ph->rcv_port);
+ ph->rcv_port = MACH_PORT_NULL;
+ }
+
+ if (ph->mach_dev != MACH_PORT_NULL) {
+ device_close(ph->mach_dev);
+ ph->mach_dev = MACH_PORT_NULL;
+ }
+
+ pcap_cleanup_live_common(p);
+}
+
+static int
+pcap_activate_hurd(pcap_t *p)
+{
+ struct pcap_hurd *ph;
+ mach_port_t master;
+ kern_return_t kr;
+
+ ph = p->priv;
+
+ /* Try devnode first */
+ master = file_name_lookup(p->opt.device, O_READ | O_WRITE, 0);
+
+ if (master != MACH_PORT_NULL)
+ kr = device_open(master, D_WRITE | D_READ, "eth", &ph->mach_dev);
+ else {
+ /* If unsuccessful, try Mach device */
+ kr = get_privileged_ports(NULL, &master);
+
+ if (kr) {
+ snprintf(p->errbuf, sizeof(p->errbuf),
+ "get_privileged_ports: %s", pcap_strerror(kr));
+ goto error;
+ }
+
+ kr = device_open(master, D_READ | D_WRITE, p->opt.device,
+ &ph->mach_dev);
+ }
+
+ mach_port_deallocate(mach_task_self(), master);
+
+ if (kr) {
+ snprintf(p->errbuf, sizeof(p->errbuf), "device_open: %s",
+ pcap_strerror(kr));
+ goto error;
+ }
+
+ kr = mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE,
+ &ph->rcv_port);
+
+ if (kr) {
+ snprintf(p->errbuf, sizeof(p->errbuf), "mach_port_allocate: %s",
+ pcap_strerror(kr));
+ goto error;
+ }
+
+ kr = device_set_filter(ph->mach_dev, ph->rcv_port,
+ MACH_MSG_TYPE_MAKE_SEND, 0,
+ (filter_array_t)filter, FILTER_COUNT);
+
+ if (kr) {
+ snprintf(p->errbuf, sizeof(p->errbuf), "device_set_filter: %s",
+ pcap_strerror(kr));
+ goto error;
+ }
+
+ /* XXX Ethernet only currently */
+ p->linktype = DLT_EN10MB;
+
+ p->bufsize = sizeof(struct net_rcv_msg);
+ p->buffer = malloc(p->bufsize);
+
+ if (p->buffer == NULL) {
+ snprintf(p->errbuf, sizeof(p->errbuf), "malloc: %s",
+ pcap_strerror(errno));
+ goto error;
+ }
+
+ p->dlt_list = malloc(sizeof(*p->dlt_list));
+
+ if (p->dlt_list != NULL)
+ *p->dlt_list = DLT_EN10MB;
+
+ p->read_op = pcap_read_hurd;
+ p->inject_op = pcap_inject_hurd;
+ p->setfilter_op = install_bpf_program;
+ p->stats_op = pcap_stats_hurd;
+
+ return 0;
+
+error:
+ pcap_cleanup_hurd(p);
+ return PCAP_ERROR;
+}
+
+pcap_t *
+pcap_create_interface(const char *device _U_, char *ebuf)
+{
+ struct pcap_hurd *ph;
+ pcap_t *p;
+
+ p = PCAP_CREATE_COMMON(ebuf, struct pcap_hurd);
+ if (p == NULL)
+ return NULL;
+
+ ph = p->priv;
+ ph->mach_dev = MACH_PORT_NULL;
+ ph->rcv_port = MACH_PORT_NULL;
+ p->activate_op = pcap_activate_hurd;
+ return p;
+}
+
+int
+pcap_platform_finddevs(pcap_if_list_t *alldevsp, char *errbuf)
+{
+ return 0;
+}
+
+/*
+ * Libpcap version string.
+ */
+const char *
+pcap_lib_version(void)
+{
+ return PCAP_VERSION_STRING;
+}
|