Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump

[tcpdump] / print-dccp.c

diff --git a/print-dccp.c b/print-dccp.c
index 771762ed51e9c18d756fc60e0ebeeb0adaf9221c..a7f07b43ab44ae84b5e703dc0964a5613cc4410a 100644 (file)
--- a/print-dccp.c
+++ b/print-dccp.c
@@ -164,22 +164,22 @@ static const char *dccp_reset_codes[] = {
 };
 
 static const char *dccp_feature_nums[] = {
-       "reserved", 
+       "reserved",
        "ccid",
        "allow_short_seqno",
        "sequence_window",
-       "ecn_incapable", 
-       "ack_ratio",     
+       "ecn_incapable",
+       "ack_ratio",
        "send_ack_vector",
-       "send_ndp_count", 
-       "minimum checksum coverage", 
+       "send_ndp_count",
+       "minimum checksum coverage",
        "check data checksum",
 };
 
 static inline u_int dccp_csum_coverage(const struct dccp_hdr* dh, u_int len)
 {
        u_int cov;
-       
+
        if (DCCPH_CSCOV(dh) == 0)
                return len;
        cov = (dh->dccph_doff + DCCPH_CSCOV(dh) - 1) * sizeof(u_int32_t);
@@ -278,7 +278,7 @@ static int dccp_print_option(const u_char *option);
 /**
  * dccp_print - show dccp packet
  * @bp - beginning of dccp packet
- * @data2 - beginning of enclosing 
+ * @data2 - beginning of enclosing
  * @len - lenght of ip packet
  */
 void dccp_print(const u_char *bp, const u_char *data2, u_int len)
@@ -426,7 +426,7 @@ void dccp_print(const u_char *bp, const u_char *data2, u_int len)
                break;
        }
 
-       if ((DCCPH_TYPE(dh) != DCCP_PKT_DATA) && 
+       if ((DCCPH_TYPE(dh) != DCCP_PKT_DATA) &&
                        (DCCPH_TYPE(dh) != DCCP_PKT_REQUEST))
                dccp_print_ack_no(bp);
 
@@ -440,19 +440,19 @@ void dccp_print(const u_char *bp, const u_char *data2, u_int len)
                const u_char *cp;
                u_int optlen;
                cp = bp + dccp_basic_hdr_len(dh) + extlen;
-               printf(" <");   
+               printf(" <");
 
                hlen -= dccp_basic_hdr_len(dh) + extlen;
                while(1){
                        TCHECK(*cp);
                        optlen = dccp_print_option(cp);
                        if (!optlen) goto trunc2;
-                       if (hlen <= optlen) break; 
+                       if (hlen <= optlen) break;
                        hlen -= optlen;
                        cp += optlen;
                        printf(", ");
                }
-               printf(">");    
+               printf(">");
        }
        return;
 trunc:
@@ -462,7 +462,7 @@ trunc2:
 }
 
 static int dccp_print_option(const u_char *option)
-{      
+{
        u_int8_t optlen, i;
 
        TCHECK(*option);
@@ -481,60 +481,60 @@ static int dccp_print_option(const u_char *option)
        switch (*option){
        case 0:
                printf("nop");
-               break;  
+               break;
        case 1:
                printf("mandatory");
-               break;  
+               break;
        case 2:
                printf("slowreceiver");
-               break;  
+               break;
        case 32:
                printf("change_l");
                if (*(option +2) < 10){
                        printf(" %s", dccp_feature_nums[*(option +2)]);
-                       for (i = 0; i < optlen -3; i ++) printf(" %d", *(option +3 + i));       
+                       for (i = 0; i < optlen -3; i ++) printf(" %d", *(option +3 + i));
                }
-               break;  
+               break;
        case 33:
                printf("confirm_l");
                if (*(option +2) < 10){
                        printf(" %s", dccp_feature_nums[*(option +2)]);
-                       for (i = 0; i < optlen -3; i ++) printf(" %d", *(option +3 + i));       
+                       for (i = 0; i < optlen -3; i ++) printf(" %d", *(option +3 + i));
                }
                break;
        case 34:
                printf("change_r");
                if (*(option +2) < 10){
                        printf(" %s", dccp_feature_nums[*(option +2)]);
-                       for (i = 0; i < optlen -3; i ++) printf(" %d", *(option +3 + i));       
+                       for (i = 0; i < optlen -3; i ++) printf(" %d", *(option +3 + i));
                }
                break;
        case 35:
                printf("confirm_r");
                if (*(option +2) < 10){
                        printf(" %s", dccp_feature_nums[*(option +2)]);
-                       for (i = 0; i < optlen -3; i ++) printf(" %d", *(option +3 + i));       
+                       for (i = 0; i < optlen -3; i ++) printf(" %d", *(option +3 + i));
                }
                break;
        case 36:
                printf("initcookie 0x");
-               for (i = 0; i < optlen -2; i ++) printf("%02x", *(option +2 + i));      
+               for (i = 0; i < optlen -2; i ++) printf("%02x", *(option +2 + i));
                break;
        case 37:
                printf("ndp_count");
-               for (i = 0; i < optlen -2; i ++) printf(" %d", *(option +2 + i));       
+               for (i = 0; i < optlen -2; i ++) printf(" %d", *(option +2 + i));
                break;
        case 38:
                printf("ack_vector0 0x");
-               for (i = 0; i < optlen -2; i ++) printf("%02x", *(option +2 + i));      
+               for (i = 0; i < optlen -2; i ++) printf("%02x", *(option +2 + i));
                break;
        case 39:
                printf("ack_vector1 0x");
-               for (i = 0; i < optlen -2; i ++) printf("%02x", *(option +2 + i));      
+               for (i = 0; i < optlen -2; i ++) printf("%02x", *(option +2 + i));
                break;
        case 40:
                printf("data_dropped 0x");
-               for (i = 0; i < optlen -2; i ++) printf("%02x", *(option +2 + i));      
+               for (i = 0; i < optlen -2; i ++) printf("%02x", *(option +2 + i));
                break;
        case 41:
                printf("timestamp %u", EXTRACT_32BITS(option + 2));
@@ -551,7 +551,7 @@ static int dccp_print_option(const u_char *option)
                break;
        case 44:
                printf("data_checksum ");
-               for (i = 0; i < optlen -2; i ++) printf("%02x", *(option +2 + i));      
+               for (i = 0; i < optlen -2; i ++) printf("%02x", *(option +2 + i));
                break;
        default :
                if (*option >= 128) {
@@ -568,7 +568,7 @@ static int dccp_print_option(const u_char *option)
                        }
                        break;
                }
-                       
+
                printf("unknown_opt %d", *option);
                break;
        }