Changeset f5d654e for libpacketdump

Timestamp:

04/02/08 16:32:01 (14 years ago)

Author:

Shane Alcock <salcock@…>

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:

dd1217b

Parents:

007fb43

Message:

Some fixes to deal with errors and warnings that appear with old gcc - e.g. 2.95

• Added 'static' to functions that are only used internally
• Moved variable declarations to the start of the code block, before any actual code

Location:

libpacketdump

Files:

• eth_2054.c (modified) (2 diffs)
• ip_6.c (modified) (3 diffs)
• link_4.c (modified) (2 diffs)

libpacketdump/eth_2054.c

@@ -20 +20 @@
  * attempt to decode.
  */
-char *format_hrd(struct arphdr *arp, char *hrd) {
+static char *format_hrd(struct arphdr *arp, char *hrd) {
         static char buffer[1024] = {0,};
         int i;
@@ -50 +50 @@
  * attempt to decode.
  */
-char *format_pro(struct arphdr *arp, char *pro) {
+static char *format_pro(struct arphdr *arp, char *pro) {
         static char buffer[1024] = {0,};
         int i;

libpacketdump/ip_6.c

@@ -22 +22 @@
 void decode(int link_type,char *packet,unsigned len)
 {
+        unsigned char *pkt = NULL;
+        unsigned char type,optlen,*data;
+        int plen, i;
         libtrace_tcp_t *tcp = (libtrace_tcp_t *)packet;
         printf(" TCP:");
@@ -69 +72 @@
         DISPLAYS(check," Checksum %i");
         DISPLAYS(urg_ptr," Urgent %i");
-        unsigned char *pkt = (unsigned char*)packet+sizeof(*tcp);
-        int plen = (len-sizeof *tcp) < (tcp->doff*4-sizeof(*tcp))?(len-sizeof(*tcp)):(tcp->doff*4-sizeof *tcp);
-        unsigned char type,optlen,*data;
+        pkt = (unsigned char*)packet+sizeof(*tcp);
+        plen = (len-sizeof *tcp) < (tcp->doff*4-sizeof(*tcp))?(len-sizeof(*tcp)):(tcp->doff*4-sizeof *tcp);
         while(trace_get_next_option(&pkt,&plen,&type,&optlen,&data)) {
                 printf("\n TCP: ");
@@ -92 +94 @@
                         case 5:
                                 printf("SACK Information");
-                                int i;
                                 i=0;
                                 while(i+8<optlen) {

libpacketdump/link_4.c

@@ -99 +99 @@
 } __attribute__ ((__packed__)) ieee80211_payload;
 
-char *macaddr(uint8_t mac[]) {
+static char *macaddr(uint8_t mac[]) {
         static char ether_buf[18] = {0, };
         trace_ether_ntoa(mac, ether_buf);
@@ -724 +724 @@
         
         if (len > hdrlen) {
-                pld = (ieee80211_payload *) ((char *)pkt + hdrlen) ;
                 int payload_offset = 0;
                 uint16_t ethertype = 0;
+                pld = (ieee80211_payload *) ((char *)pkt + hdrlen) ;
                 if (ntohs(pld->ethertype) == 0xaaaa) {
                         /* 802.11 payload contains an 802.2 LLC/SNAP header */