Changeset 729

Timestamp:

04/23/06 17:55:09 (7 years ago)

Author:

perry

Message:

Added support for writing onto an interface to pcap and linuxnative

Location:

trunk

Files:

• configure.in (modified) (1 diff)
• lib/format_linux.c (modified) (7 diffs)
• lib/format_pcap.c (modified) (5 diffs)
• lib/trace.c (modified) (1 diff)

trunk/configure.in

@@ -154 +154 @@
                 AC_REPLACE_FUNCS(pcap_dump_flush)
         fi
+
+        AC_CHECK_LIB(pcap,pcap_inject,
+                        AC_DEFINE(HAVE_PCAP_INJECT,1,[pcap has pcap_inject]),
+                        have_pcap_inject=false)
+
+        AC_CHECK_LIB(pcap,pcap_sendpacket,
+                        AC_DEFINE(HAVE_PCAP_SENDPACKET,1,[pcap has pcap_sendpacket]),
+                        have_pcap_sendpacket=false)
 fi
 

trunk/lib/format_linux.c

@@ -65 +65 @@
 };
 
+struct libtrace_linuxnative_format_data_t {
+        int fd;
+};
+
 #define FORMAT(x) ((struct libtrace_format_data_t*)(x))
+#define DATAOUT(x) ((struct libtrace_linuxnative_format_data_t*)((x)->format_data))
 
 static int linuxnative_init_input(libtrace_t *libtrace) 
@@ -74 +79 @@
         FORMAT(libtrace->format_data)->promisc = 0;
         FORMAT(libtrace->format_data)->snaplen = 65536;
+
+        return 0;
+}
+
+static int linuxnative_init_output(libtrace_out_t *libtrace)
+{
+        libtrace->format_data = (struct libtrace_linuxnative_format_data_t*)
+                malloc(sizeof(struct libtrace_linuxnative_format_data_t));
+        DATAOUT(libtrace)->fd = -1;
 
         return 0;
@@ -122 +136 @@
 }
 
+static int linuxnative_start_output(libtrace_out_t *libtrace)
+{
+        FORMAT(libtrace->format_data)->fd = 
+                                socket(PF_PACKET, SOCK_RAW, 0);
+        if (FORMAT(libtrace->format_data)->fd==-1) {
+                free(libtrace->format_data);
+                return -1;
+        }
+
+        return 0;
+}
+
 static int linuxnative_pause_input(libtrace_t *libtrace)
 {
@@ -132 +158 @@
 static int linuxnative_fin_input(libtrace_t *libtrace) 
 {
+        free(libtrace->format_data);
+        return 0;
+}
+
+static int linuxnative_fin_output(libtrace_out_t *libtrace)
+{
+        close(DATAOUT(libtrace)->fd);
+        DATAOUT(libtrace)->fd=-1;
         free(libtrace->format_data);
         return 0;
@@ -165 +199 @@
 #define LIBTRACE_MIN(a,b) ((a)<(b) ? (a) : (b))
 
-static int linuxnative_read_packet(libtrace_t *libtrace, libtrace_packet_t *packet) {
+static int linuxnative_read_packet(libtrace_t *libtrace, libtrace_packet_t *packet) 
+{
         struct libtrace_linuxnative_header *hdr;
         socklen_t socklen;
@@ -201 +236 @@
 }
 
+static int linuxnative_write_packet(libtrace_out_t *trace, 
+                const libtrace_packet_t *packet) 
+{
+        struct sockaddr_ll hdr;
+
+        hdr.sll_family = AF_PACKET;
+        hdr.sll_protocol = 0;
+        hdr.sll_ifindex = if_nametoindex(packet->trace->uridata);
+        hdr.sll_hatype = 0;
+        hdr.sll_pkttype = 0;
+        hdr.sll_halen = 6; /* FIXME */
+        memcpy(hdr.sll_addr,packet->payload,hdr.sll_halen);
+
+        return sendto(DATAOUT(trace)->fd,
+                        packet->payload,
+                        trace_get_capture_length(packet),
+                        0,
+                        (struct sockaddr*)&hdr, sizeof(hdr));
+
+}
+
 static libtrace_linktype_t linuxnative_get_link_type(const struct libtrace_packet_t *packet) {
         switch (htons((((struct libtrace_linuxnative_header*)(packet->buffer))->hdr.sll_protocol))) {
@@ -264 +320 @@
         linuxnative_start_input,        /* start_input */
         linuxnative_pause_input,        /* pause_input */
-        NULL,                           /* init_output */
+        linuxnative_init_output,        /* init_output */
         NULL,                           /* config_output */
-        NULL,                           /* start_ouput */
+        linuxnative_start_output,       /* start_ouput */
         linuxnative_fin_input,          /* fin_input */
-        NULL,                           /* fin_output */
+        linuxnative_fin_output,         /* fin_output */
         linuxnative_read_packet,        /* read_packet */
         NULL,                           /* fin_packet */
-        NULL,                           /* write_packet */
+        linuxnative_write_packet,       /* write_packet */
         linuxnative_get_link_type,      /* get_link_type */
         linuxnative_get_direction,      /* get_direction */

trunk/lib/format_pcap.c

@@ -155 +155 @@
 }
 
-static int pcap_init_output(struct libtrace_out_t *libtrace) {
+static int pcap_init_output(libtrace_out_t *libtrace) {
         libtrace->format_data = malloc(sizeof(struct pcap_format_data_out_t));
         OUTPUT.trace.pcap = NULL;
         OUTPUT.trace.dump = NULL;
         return 0;
+}
+
+static int pcapint_init_output(libtrace_out_t *libtrace) {
+#ifdef HAVE_PCAP_INJECT
+        libtrace->format_data = malloc(sizeof(struct pcap_format_data_out_t));
+        OUTPUT.trace.pcap = NULL;
+        OUTPUT.trace.dump = NULL;
+        return 0;
+#else
+#ifdef HAVE_PCAP_SENDPACKET
+        libtrace->format_data = malloc(sizeof(struct pcap_format_data_out_t));
+        OUTPUT.trace.pcap = NULL;
+        OUTPUT.trace.dump = NULL;
+        return 0;
+#else
+        trace_set_err_out(libtrace,TRACE_ERR_NO_INIT_OUT,
+                        "writing not supported by this version of pcap");
+        return -1;
+#endif
+#endif
 }
 
@@ -237 +257 @@
 }
 
+static int pcapint_fin_output(libtrace_out_t *libtrace)
+{
+        pcap_close(OUTPUT.trace.pcap);
+        free(libtrace->format_data);
+        return 0;
+}
+
 static void trace_pcap_handler(u_char *user, const struct pcap_pkthdr *pcaphdr, const u_char *pcappkt) {
         struct libtrace_packet_t *packet = (struct libtrace_packet_t *)user;    
@@ -260 +287 @@
 }
 
+/* TODO: use pcap_next_ex() if available */
 static int pcap_read_packet(struct libtrace_t *libtrace, struct libtrace_packet_t *packet) {
         int pcapbytes = 0;
@@ -315 +343 @@
         }
         return 0;
+}
+
+static int pcapint_write_packet(libtrace_out_t *libtrace, const libtrace_packet_t *packet) {
+        int err;
+
+        if (!OUTPUT.trace.pcap) {
+                OUTPUT.trace.pcap = (pcap_t *)pcap_open_live(
+                        libtrace->uridata,65536,0,0,NULL);
+        }
+#if HAVE_PCAP_INJECT
+        err=pcap_inject(OUTPUT.trace.pcap,
+                        packet->payload,
+                        trace_get_capture_length(packet));
+        if (err!=trace_get_capture_length(packet))
+                err=-1;
+#else 
+#if HAVE_PCAP_SENDPACKET
+        err=pcap_sendpacket(OUTPUT.trace.pcap,
+                        packet->payload,
+                        trace_get_capture_length(packet));
+#endif
+#endif
+        return err;
 }
 
@@ -504 +555 @@
         pcapint_start_input,            /* start_input */
         pcapint_pause_input,            /* pause_input */
-        NULL,                           /* init_output */
+        pcapint_init_output,            /* init_output */
         NULL,                           /* config_output */
         NULL,                           /* start_output */
         pcap_fin_input,                 /* fin_input */
-        NULL,                           /* fin_output */
+        pcapint_fin_output,             /* fin_output */
         pcap_read_packet,               /* read_packet */
         NULL,                           /* fin_packet */
-        NULL,                           /* write_packet */
+        pcapint_write_packet,           /* write_packet */
         pcap_get_link_type,             /* get_link_type */
         pcap_get_direction,             /* get_direction */

trunk/lib/trace.c

@@ -131 +131 @@
          * format module is sane.
          */ 
-#if 0
+#if 1
         if (f->init_input) {
 #define REQUIRE(x) \