Changeset f0b9060

Timestamp:

07/03/06 13:20:45 (15 years ago)

Author:

Daniel Lawson <dlawson@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

5bb5dd2

Parents:

b49ea36

Message:

removed trace_ prefix on functions where it isn't needed

Location:

swig

Files:

• libtrace.i (modified) (4 diffs)
• python/check.py (modified) (4 diffs)

swig/libtrace.i

@@ -153 +153 @@
                 trace_destroy_packet(self);
                 }
-        libtrace_packet_t *trace_copy_packet() {
+        libtrace_packet_t *copy_packet() {
                 return trace_copy_packet(self);
         }
-        void *trace_get_link() {
+        void *get_link() {
                 return trace_get_link(self);
         }
-        void *trace_get_transport(uint8_t *proto, uint32_t *remaining) {
+        void *get_transport(uint8_t *proto, uint32_t *remaining) {
                 return trace_get_transport(self, proto, remaining);
         }
-        struct libtrace_ip *trace_get_ip() {
+        struct libtrace_ip *get_ip() {
                 return trace_get_ip(self);
         }
-        struct libtrace_tcp *trace_get_tcp() {
+        struct libtrace_tcp *get_tcp() {
                 return trace_get_tcp(self);
         }
-        struct libtrace_udp *trace_get_udp() {
+        struct libtrace_udp *get_udp() {
                 return trace_get_udp(self);
         }
-        struct libtrace_icmp *trace_get_icmp() {
+        struct libtrace_icmp *get_icmp() {
                 return trace_get_icmp(self);
         }
-        char *trace_get_destination_mac() {
+        char *get_destination_mac() {
                 return trace_ether_ntoa(trace_get_destination_mac(self),0);
         }
-        char *trace_get_source_mac() {
+        char *get_source_mac() {
                 return trace_ether_ntoa(trace_get_source_mac(self),0);
         }
-        char *trace_ether_ntoa(uint8_t *mac) {
+        char *ether_ntoa(uint8_t *mac) {
                 return trace_ether_ntoa(mac, 0);
         }
-        uint16_t trace_get_source_port() {
+        uint16_t get_source_port() {
                 return trace_get_source_port(self);
         }
-        uint16_t trace_get_destination_port() {
+        uint16_t get_destination_port() {
                 return trace_get_destination_port(self);
         }
-        double trace_get_seconds() {
+        double get_seconds() {
                 return trace_get_seconds(self);
         }
-        uint64_t trace_get_erf_timestamp() {
+        uint64_t get_erf_timestamp() {
                 return trace_get_erf_timestamp(self);
         }
-        struct timeval trace_get_timeval() {
+        struct timeval get_timeval() {
                 return trace_get_timeval(self);
         }
-        int trace_get_capture_length() {
+        int get_capture_length() {
                 return trace_get_capture_length(self);
         }
-        size_t trace_set_capture_length(size_t size) {
+        size_t set_capture_length(size_t size) {
                 return trace_set_capture_length(self,size);
         }
-        int trace_get_wire_lenth() {
+        int get_wire_lenth() {
                 return trace_get_wire_length(self);
         }
-        int trace_get_framing_length() {
+        int get_framing_length() {
                 return trace_get_framing_length(self);
         }
-        libtrace_linktype_t trace_get_link_type() {
+        libtrace_linktype_t get_link_type() {
                 return trace_get_link_type(self);
         }
-        int8_t trace_get_direction() {
+        int8_t get_direction() {
                 return trace_get_direction(self);
         }
-        int8_t trace_set_direction(int8_t direction) {
+        int8_t set_direction(int8_t direction) {
                 return trace_set_direction(self,direction);
         }
-        int trace_apply_filter(struct libtrace_filter_t *filter) {
+        int apply_filter(struct libtrace_filter_t *filter) {
                 return trace_apply_filter(filter,self);
         }
-        uint8_t trace_get_server_port(uint8_t protocol, uint16_t source,
+        uint8_t get_server_port(uint8_t protocol, uint16_t source,
                         uint16_t dest) {
                 return trace_get_server_port(protocol,source,dest);
@@ -239 +239 @@
                 trace_destroy_filter(self);
         };
-        int trace_apply_filter(struct libtrace_packet_t *packet) {
+        int apply_filter(struct libtrace_packet_t *packet) {
                 return trace_apply_filter(self,packet);
         }
@@ -250 +250 @@
         libtrace_t(char *uri) { return trace_create(uri); };
         ~libtrace_t() { trace_destroy(self); }
-        int trace_read_packet(struct libtrace_packet_t *packet) { 
+        int read_packet(struct libtrace_packet_t *packet) { 
                 return trace_read_packet(self,packet);
         }
-        int trace_start() {
+        int start() {
                 return trace_start(self);
         }
-        int trace_pause() {
+        int pause() {
                 return trace_pause(self);
         }
-        void trace_help() {
+        void help() {
                 trace_help();
         }
-        int trace_config(trace_option_t option, void *value) {
+        int config(trace_option_t option, void *value) {
                 return trace_config(self, option, value); 
         }
-        libtrace_err_t trace_get_err() {
+        libtrace_err_t get_err() {
                 return trace_get_err(self);
         }
-        bool trace_is_err() {
+        bool is_err() {
                 return trace_is_err(self);
         }
@@ -279 +279 @@
         libtrace_out_t(char *uri) { return trace_create_output(uri); };
         ~libtrace_t() { trace_destroy_output(self); }
-        int trace_start_output() {
+        int start_output() {
                 return trace_start_output(self);
         }
-        int trace_config_output(trace_option_output_t option, void *value) {
+        int config_output(trace_option_output_t option, void *value) {
                 return trace_config_output(self, option, value);
         }
-        libtrace_err_t trace_get_err_output() {
+        libtrace_err_t get_err_output() {
                 return trace_get_err_output(self);
         }
-        bool trace_is_err_output() {
+        bool is_err_output() {
                 return trace_is_err_output(self);
         }
-        int trace_write_packet(libtrace_packet_t *packet) {
+        int write_packet(libtrace_packet_t *packet) {
                 return trace_write_packet(self, packet);
         }

swig/python/check.py

@@ -6 +6 @@
 trace = libtrace.Trace(sys.argv[1])
 
-if trace.trace_is_err():
+if trace.is_err():
         print "Trace failed: %s" % trace.trace_get_err()
         sys.exit()
@@ -20 +20 @@
 print "filter=",filter
 
-ret=trace.trace_start()
+ret=trace.start()
 
 if ret < 0:
@@ -27 +27 @@
 
 while 1:
-        trace.trace_read_packet(packet)
+        trace.read_packet(packet)
         if not packet:
                 break
 
-        ippacket = packet.trace_get_ip()
+        ippacket = packet.get_ip()
         if not ippacket:
                 continue
@@ -39 +39 @@
                 print count
 
-        tcppacket = packet.trace_get_tcp()
+        tcppacket = packet.get_tcp()
         if not tcppacket:
                 continue
 
-        if not packet.trace_apply_filter(filter):
+        if not packet.apply_filter(filter):
                 continue
         
-        src = packet.trace_get_source_port()
-        dst = packet.trace_get_destination_port()
-        if packet.trace_get_server_port(4,src,dst) == 0:
+        src = packet.get_source_port()
+        dst = packet.get_destination_port()
+        if packet.get_server_port(4,src,dst) == 0:
                 print ippacket.ip_src,':',src,'->',ippacket.ip_dst,':',dst
         else: