Functions in libnetdissect must use ndo_error() function

[tcpdump] / print-tcp.c

diff --git a/print-tcp.c b/print-tcp.c
index 9334a2d0b05e6d2c70cd6107583f61f4899fdaa4..a1d68a8adddaa0269a2f42007d0bb9581a076e1e 100644 (file)
--- a/print-tcp.c
+++ b/print-tcp.c
@@ -51,11 +51,9 @@ __RCSID("$NetBSD: print-tcp.c,v 1.8 2007/07/24 11:53:48 drochner Exp $");
 #include "rpc_auth.h"
 #include "rpc_msg.h"
 
 #include "rpc_auth.h"
 #include "rpc_msg.h"
 

-#include "nameser.h"
-

 #ifdef HAVE_LIBCRYPTO
 #include <openssl/md5.h>
 #ifdef HAVE_LIBCRYPTO
 #include <openssl/md5.h>

-#include <signature.h>
+#include "signature.h"

 
 static int tcp_verify_signature(netdissect_options *ndo,
                                 const struct ip *ip, const struct tcphdr *tp,
 
 static int tcp_verify_signature(netdissect_options *ndo,
                                 const struct ip *ip, const struct tcphdr *tp,


@@ -196,12 +194,12 @@ tcp_print(netdissect_options *ndo,
                 if (ip6->ip6_nxt == IPPROTO_TCP) {
                         ND_PRINT((ndo, "%s.%s > %s.%s: ",
                                      ip6addr_string(ndo, &ip6->ip6_src),
                 if (ip6->ip6_nxt == IPPROTO_TCP) {
                         ND_PRINT((ndo, "%s.%s > %s.%s: ",
                                      ip6addr_string(ndo, &ip6->ip6_src),

-                                     tcpport_string(sport),
+                                     tcpport_string(ndo, sport),

                                      ip6addr_string(ndo, &ip6->ip6_dst),
                                      ip6addr_string(ndo, &ip6->ip6_dst),

-                                     tcpport_string(dport)));
+                                     tcpport_string(ndo, dport)));

                 } else {
                         ND_PRINT((ndo, "%s > %s: ",
                 } else {
                         ND_PRINT((ndo, "%s > %s: ",

-                                     tcpport_string(sport), tcpport_string(dport)));
+                                     tcpport_string(ndo, sport), tcpport_string(ndo, dport)));

                 }
         } else
 #endif /*INET6*/
                 }
         } else
 #endif /*INET6*/


@@ -209,12 +207,12 @@ tcp_print(netdissect_options *ndo,
                 if (ip->ip_p == IPPROTO_TCP) {
                         ND_PRINT((ndo, "%s.%s > %s.%s: ",
                                      ipaddr_string(ndo, &ip->ip_src),
                 if (ip->ip_p == IPPROTO_TCP) {
                         ND_PRINT((ndo, "%s.%s > %s.%s: ",
                                      ipaddr_string(ndo, &ip->ip_src),

-                                     tcpport_string(sport),
+                                     tcpport_string(ndo, sport),

                                      ipaddr_string(ndo, &ip->ip_dst),
                                      ipaddr_string(ndo, &ip->ip_dst),

-                                     tcpport_string(dport)));
+                                     tcpport_string(ndo, dport)));

                 } else {
                         ND_PRINT((ndo, "%s > %s: ",
                 } else {
                         ND_PRINT((ndo, "%s > %s: ",

-                                     tcpport_string(sport), tcpport_string(dport)));
+                                     tcpport_string(ndo, sport), tcpport_string(ndo, dport)));

                 }
         }
 
                 }
         }
 


@@ -289,7 +287,8 @@ tcp_print(netdissect_options *ndo,
                                         th->nxt = (struct tcp_seq_hash6 *)
                                                 calloc(1, sizeof(*th));
                                         if (th->nxt == NULL)
                                         th->nxt = (struct tcp_seq_hash6 *)
                                                 calloc(1, sizeof(*th));
                                         if (th->nxt == NULL)

-                                                error("tcp_print: calloc");
+                                                (*ndo->ndo_error)(ndo,
+                                                                 "tcp_print: calloc");

                                 }
                                 th->addr = tha;
                                 if (rev)
                                 }
                                 th->addr = tha;
                                 if (rev)


@@ -345,7 +344,8 @@ tcp_print(netdissect_options *ndo,
                                         th->nxt = (struct tcp_seq_hash *)
                                                 calloc(1, sizeof(*th));
                                         if (th->nxt == NULL)
                                         th->nxt = (struct tcp_seq_hash *)
                                                 calloc(1, sizeof(*th));
                                         if (th->nxt == NULL)

-                                                error("tcp_print: calloc");
+                                                (*ndo->ndo_error)(ndo,
+                                                                 "tcp_print: calloc");

                                 }
                                 th->addr = tha;
                                 if (rev)
                                 }
                                 th->addr = tha;
                                 if (rev)


@@ -700,8 +700,7 @@ tcp_print(netdissect_options *ndo,
                 ND_PRINT((ndo, ": "));
                 rtsp_print(ndo, bp, length);
         } else if (length > 2 &&
                 ND_PRINT((ndo, ": "));
                 rtsp_print(ndo, bp, length);
         } else if (length > 2 &&

-                 (sport == NAMESERVER_PORT || dport == NAMESERVER_PORT ||
-                  sport == MULTICASTDNS_PORT || dport == MULTICASTDNS_PORT)) {
+                 (sport == NAMESERVER_PORT || dport == NAMESERVER_PORT)) {

                 /*
                  * TCP DNS query has 2byte length at the head.
                  * XXX packet could be unaligned, it can go strange
                 /*
                  * TCP DNS query has 2byte length at the head.
                  * XXX packet could be unaligned, it can go strange