Revert "autotools: don't link with -lcrypto twice."

[tcpdump] / netdissect.c

diff --git a/netdissect.c b/netdissect.c
index 000d1ffce8c2c6eb9a47f36e9a79e0b5ec2b258e..548989b76545f74960d908199cb8be1763e4cfa5 100644 (file)
--- a/netdissect.c
+++ b/netdissect.c
@@ -22,9 +22,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 #include "netdissect.h"
@@ -36,6 +34,10 @@
 #include <smi.h>
 #endif
 
+#ifdef _AIX
+#include "diag-control.h"
+#endif /* _AIX */
+
 /*
  * Initialize anything that must be initialized before dissecting
  * packets.
@@ -81,7 +83,7 @@ nd_init(char *errbuf, size_t errbuf_size)
 }
 
 /*
- * Clean up anything that ndo_init() did.
+ * Clean up anything that nd_init() did.
  */
 void
 nd_cleanup(void)
@@ -299,3 +301,17 @@ nd_pop_all_packet_info(netdissect_options *ndo)
        while (ndo->ndo_packet_info_stack != NULL)
                nd_pop_packet_info(ndo);
 }
+
+NORETURN void
+nd_trunc_longjmp(netdissect_options *ndo)
+{
+       longjmp(ndo->ndo_early_end, ND_TRUNCATED);
+#ifdef _AIX
+       /*
+        * In AIX <setjmp.h> decorates longjmp() with "#pragma leaves", which tells
+        * XL C that the function is noreturn, but GCC remains unaware of that and
+        * yields a "'noreturn' function does return" warning.
+        */
+       ND_NOT_REACHABLE
+#endif /* _AIX */
+}