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

[tcpdump] / print-forces.c

diff --git a/print-forces.c b/print-forces.c
index 3451ff9a96fc38ed54c1322240eeac8a6863a00a..517b721939c3dba5857f14533f3ef6522b523767 100644 (file)
--- a/print-forces.c
+++ b/print-forces.c
@@ -702,7 +702,7 @@ fdatatlv_print(register const u_char * pptr, register u_int len,
        if (vflag >= 3) {
                char *ib = indent_pr(indent + 2, 1);
                printf("%s[", &ib[1]);
-               hex_print_with_offset(ib, tdp, rlen, 0);
+               hex_print_with_offset(gndo,ib, tdp, rlen, 0);
                printf("\n%s]\n", &ib[1]);
        }
        return 0;
@@ -736,7 +736,7 @@ sdatailv_print(register const u_char * pptr, register u_int len,
                invilv = ilv_valid(ilv, rlen);
                if (invilv) {
                        printf("%s[", &ib[1]);
-                       hex_print_with_offset(ib, tdp, rlen, 0);
+                       hex_print_with_offset(gndo,ib, tdp, rlen, 0);
                        printf("\n%s]\n", &ib[1]);
                        return -1;
                }
@@ -744,7 +744,7 @@ sdatailv_print(register const u_char * pptr, register u_int len,
                        int ilvl = EXTRACT_32BITS(&ilv->length);
                        printf("\n%s ILV: type %x length %d\n", &ib[1],
                               EXTRACT_32BITS(&ilv->type), ilvl);
-                       hex_print_with_offset("\t\t[", tdp, ilvl-ILV_HDRL, 0);
+                       hex_print_with_offset(gndo,"\t\t[", tdp, ilvl-ILV_HDRL, 0);
                }
 
                ilv = GO_NXT_ILV(ilv, rlen);
@@ -971,7 +971,7 @@ pdatacnt_print(register const u_char * pptr, register u_int len,
                               type, EXTRACT_16BITS(&pdtlv->length));
 pd_err:
                        if (EXTRACT_16BITS(&pdtlv->length)) {
-                               hex_print_with_offset("Bad Data val\n\t  [",
+                                hex_print_with_offset(gndo,"Bad Data val\n\t  [",
                                                      pptr, len, 0);
                                printf("]\n");
 
@@ -1024,7 +1024,7 @@ pdata_print(register const u_char * pptr, register u_int len,
        if (len < minsize) {
                printf("\t\t\ttruncated IDs expected %uB got %uB\n", minsize,
                       len);
-               hex_print_with_offset("\t\t\tID Data[", pptr, len, 0);
+               hex_print_with_offset(gndo,"\t\t\tID Data[", pptr, len, 0);
                printf("]\n");
                return -1;
        }
@@ -1038,7 +1038,7 @@ pdata_print(register const u_char * pptr, register u_int len,
        if (more_pd > 0) {
                int consumed = len - more_pd;
                pptr += consumed;
-               len = more_pd; 
+               len = more_pd;
                /* XXX: Argh, recurse some more */
                return recpdoptlv_print(pptr, len, op_msk, indent+1);
        } else
@@ -1156,7 +1156,7 @@ invoptlv_print(register const u_char * pptr, register u_int len,
 
        if (vflag >= 3) {
                printf("%sData[", &ib[1]);
-               hex_print_with_offset(ib, pptr, len, 0);
+               hex_print_with_offset(gndo,ib, pptr, len, 0);
                printf("%s]\n", ib);
        }
        return -1;
@@ -1356,7 +1356,7 @@ print_metailv(register const u_char * pptr, register u_int len,
        printf("%sMetaID 0x%x length %d\n", ib, EXTRACT_32BITS(&ilv->type),
               EXTRACT_32BITS(&ilv->length));
        if (vflag >= 3) {
-               hex_print_with_offset("\t\t[", ILV_DATA(ilv), rlen, 0);
+               hex_print_with_offset(gndo,"\t\t[", ILV_DATA(ilv), rlen, 0);
                printf(" ]\n");
        }
        return 0;
@@ -1421,7 +1421,7 @@ print_reddata(register const u_char * pptr, register u_int len,
 
        if (vflag >= 3) {
                printf("\t\t[");
-               hex_print_with_offset("\n\t\t", pptr, rlen, 0);
+               hex_print_with_offset(gndo,"\n\t\t", pptr, rlen, 0);
                printf("\n\t\t]");
        }
 
@@ -1725,14 +1725,14 @@ forces_print(register const u_char * pptr, register u_int len)
        rc = forces_type_print(pptr, fhdr, mlen, tops);
        if (rc < 0) {
 error:
-               hex_print_with_offset("\n\t[", pptr, len, 0);
+               hex_print_with_offset(gndo,"\n\t[", pptr, len, 0);
                printf("\n\t]");
                return;
        }
 
        if (vflag >= 4) {
                printf("\n\t  Raw ForCES message\n\t [");
-               hex_print_with_offset("\n\t ", pptr, len, 0);
+               hex_print_with_offset(gndo,"\n\t ", pptr, len, 0);
                printf("\n\t ]");
        }
        printf("\n");
@@ -1741,3 +1741,9 @@ error:
 trunc:
        printf("%s", tstr);
 }
+/*
+ * Local Variables:
+ * c-style: whitesmith
+ * c-basic-offset: 8
+ * End:
+ */