Default to first interface from pcap_findalldevs()

[tcpdump] / print-lwres.c

diff --git a/print-lwres.c b/print-lwres.c
index 59e18649206f01c502eabeabcc4878faecf62baf..7dea033556e1445e8535f3d8f8c5e9169cf16165 100644 (file)
--- a/print-lwres.c
+++ b/print-lwres.c
@@ -27,26 +27,25 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>

 
 #include "nameser.h"
 
 #include <stdio.h>
 #include <string.h>
 
 
 #include "nameser.h"
 
 #include <stdio.h>
 #include <string.h>
 

-#include "interface.h"
+#include "netdissect.h"

 #include "addrtoname.h"
 #include "addrtoname.h"

-#include "extract.h"                    /* must come after interface.h */
+#include "extract.h"

 
 /* BIND9 lib/lwres/include/lwres */
 
 /* BIND9 lib/lwres/include/lwres */

-typedef u_int32_t lwres_uint32_t;
-typedef u_int16_t lwres_uint16_t;
-typedef u_int8_t lwres_uint8_t;
+typedef uint32_t lwres_uint32_t;
+typedef uint16_t lwres_uint16_t;
+typedef uint8_t lwres_uint8_t;

 
 struct lwres_lwpacket {
        lwres_uint32_t          length;
 
 struct lwres_lwpacket {
        lwres_uint32_t          length;


@@ -210,7 +209,7 @@ static int
 lwres_printnamelen(netdissect_options *ndo,
                    const char *p)
 {
 lwres_printnamelen(netdissect_options *ndo,
                    const char *p)
 {

-       u_int16_t l;
+       uint16_t l;

        int advance;
 
        if (p + 2 > (const char *)ndo->ndo_snapend)
        int advance;
 
        if (p + 2 > (const char *)ndo->ndo_snapend)


@@ -230,7 +229,7 @@ lwres_printbinlen(netdissect_options *ndo,
                   const char *p0)
 {
        const char *p;
                   const char *p0)
 {
        const char *p;

-       u_int16_t l;
+       uint16_t l;

        int i;
 
        p = p0;
        int i;
 
        p = p0;


@@ -250,9 +249,9 @@ lwres_printbinlen(netdissect_options *ndo,
 
 static int
 lwres_printaddr(netdissect_options *ndo,
 
 static int
 lwres_printaddr(netdissect_options *ndo,

-                lwres_addr_t *ap)
+                const lwres_addr_t *ap)

 {
 {

-       u_int16_t l;
+       uint16_t l;

        const char *p;
        int i;
 
        const char *p;
        int i;
 


@@ -269,14 +268,12 @@ lwres_printaddr(netdissect_options *ndo,
                ND_PRINT((ndo, " %s", ipaddr_string(ndo, p)));
                p += sizeof(struct in_addr);
                break;
                ND_PRINT((ndo, " %s", ipaddr_string(ndo, p)));
                p += sizeof(struct in_addr);
                break;

-#ifdef INET6

        case 2: /* IPv6 */
                if (l < 16)
                        return -1;
                ND_PRINT((ndo, " %s", ip6addr_string(ndo, p)));
                p += sizeof(struct in6_addr);
                break;
        case 2: /* IPv6 */
                if (l < 16)
                        return -1;
                ND_PRINT((ndo, " %s", ip6addr_string(ndo, p)));
                p += sizeof(struct in6_addr);
                break;

-#endif

        default:
                ND_PRINT((ndo, " %u/", EXTRACT_32BITS(&ap->family)));
                for (i = 0; i < l; i++)
        default:
                ND_PRINT((ndo, " %u/", EXTRACT_32BITS(&ap->family)));
                for (i = 0; i < l; i++)


@@ -294,7 +291,7 @@ lwres_print(netdissect_options *ndo,
             register const u_char *bp, u_int length)
 {
        const struct lwres_lwpacket *np;
             register const u_char *bp, u_int length)
 {
        const struct lwres_lwpacket *np;

-       u_int32_t v;
+       uint32_t v;

        const char *s;
        int response;
        int advance;
        const char *s;
        int response;
        int advance;


@@ -343,10 +340,10 @@ lwres_print(netdissect_options *ndo,
                /*
                 * queries
                 */
                /*
                 * queries
                 */

-               lwres_gabnrequest_t *gabn;
-               lwres_gnbarequest_t *gnba;
-               lwres_grbnrequest_t *grbn;
-               u_int32_t l;
+               const lwres_gabnrequest_t *gabn;
+               const lwres_gnbarequest_t *gnba;
+               const lwres_grbnrequest_t *grbn;
+               uint32_t l;

 
                gabn = NULL;
                gnba = NULL;
 
                gabn = NULL;
                gnba = NULL;


@@ -356,7 +353,7 @@ lwres_print(netdissect_options *ndo,
                case LWRES_OPCODE_NOOP:
                        break;
                case LWRES_OPCODE_GETADDRSBYNAME:
                case LWRES_OPCODE_NOOP:
                        break;
                case LWRES_OPCODE_GETADDRSBYNAME:

-                       gabn = (lwres_gabnrequest_t *)(np + 1);
+                       gabn = (const lwres_gabnrequest_t *)(np + 1);

                        ND_TCHECK(gabn->namelen);
                        /* XXX gabn points to packed struct */
                        s = (const char *)&gabn->namelen +
                        ND_TCHECK(gabn->namelen);
                        /* XXX gabn points to packed struct */
                        s = (const char *)&gabn->namelen +


@@ -390,7 +387,7 @@ lwres_print(netdissect_options *ndo,
                        s += advance;
                        break;
                case LWRES_OPCODE_GETNAMEBYADDR:
                        s += advance;
                        break;
                case LWRES_OPCODE_GETNAMEBYADDR:

-                       gnba = (lwres_gnbarequest_t *)(np + 1);
+                       gnba = (const lwres_gnbarequest_t *)(np + 1);

                        ND_TCHECK(gnba->addr);
 
                        /* BIND910: not used */
                        ND_TCHECK(gnba->addr);
 
                        /* BIND910: not used */


@@ -408,7 +405,7 @@ lwres_print(netdissect_options *ndo,
                        break;
                case LWRES_OPCODE_GETRDATABYNAME:
                        /* XXX no trace, not tested */
                        break;
                case LWRES_OPCODE_GETRDATABYNAME:
                        /* XXX no trace, not tested */

-                       grbn = (lwres_grbnrequest_t *)(np + 1);
+                       grbn = (const lwres_grbnrequest_t *)(np + 1);

                        ND_TCHECK(grbn->namelen);
 
                        /* BIND910: not used */
                        ND_TCHECK(grbn->namelen);
 
                        /* BIND910: not used */


@@ -442,11 +439,11 @@ lwres_print(netdissect_options *ndo,
                /*
                 * responses
                 */
                /*
                 * responses
                 */

-               lwres_gabnresponse_t *gabn;
-               lwres_gnbaresponse_t *gnba;
-               lwres_grbnresponse_t *grbn;
-               u_int32_t l, na;
-               u_int32_t i;
+               const lwres_gabnresponse_t *gabn;
+               const lwres_gnbaresponse_t *gnba;
+               const lwres_grbnresponse_t *grbn;
+               uint32_t l, na;
+               uint32_t i;

 
                gabn = NULL;
                gnba = NULL;
 
                gabn = NULL;
                gnba = NULL;


@@ -456,7 +453,7 @@ lwres_print(netdissect_options *ndo,
                case LWRES_OPCODE_NOOP:
                        break;
                case LWRES_OPCODE_GETADDRSBYNAME:
                case LWRES_OPCODE_NOOP:
                        break;
                case LWRES_OPCODE_GETADDRSBYNAME:

-                       gabn = (lwres_gabnresponse_t *)(np + 1);
+                       gabn = (const lwres_gabnresponse_t *)(np + 1);

                        ND_TCHECK(gabn->realnamelen);
                        /* XXX gabn points to packed struct */
                        s = (const char *)&gabn->realnamelen +
                        ND_TCHECK(gabn->realnamelen);
                        /* XXX gabn points to packed struct */
                        s = (const char *)&gabn->realnamelen +


@@ -489,14 +486,14 @@ lwres_print(netdissect_options *ndo,
                        /* addrs */
                        na = EXTRACT_16BITS(&gabn->naddrs);
                        for (i = 0; i < na; i++) {
                        /* addrs */
                        na = EXTRACT_16BITS(&gabn->naddrs);
                        for (i = 0; i < na; i++) {

-                               advance = lwres_printaddr(ndo, (lwres_addr_t *)s);
+                               advance = lwres_printaddr(ndo, (const lwres_addr_t *)s);

                                if (advance < 0)
                                        goto trunc;
                                s += advance;
                        }
                        break;
                case LWRES_OPCODE_GETNAMEBYADDR:
                                if (advance < 0)
                                        goto trunc;
                                s += advance;
                        }
                        break;
                case LWRES_OPCODE_GETNAMEBYADDR:

-                       gnba = (lwres_gnbaresponse_t *)(np + 1);
+                       gnba = (const lwres_gnbaresponse_t *)(np + 1);

                        ND_TCHECK(gnba->realnamelen);
                        /* XXX gnba points to packed struct */
                        s = (const char *)&gnba->realnamelen +
                        ND_TCHECK(gnba->realnamelen);
                        /* XXX gnba points to packed struct */
                        s = (const char *)&gnba->realnamelen +


@@ -527,7 +524,7 @@ lwres_print(netdissect_options *ndo,
                        break;
                case LWRES_OPCODE_GETRDATABYNAME:
                        /* XXX no trace, not tested */
                        break;
                case LWRES_OPCODE_GETRDATABYNAME:
                        /* XXX no trace, not tested */

-                       grbn = (lwres_grbnresponse_t *)(np + 1);
+                       grbn = (const lwres_grbnresponse_t *)(np + 1);

                        ND_TCHECK(grbn->nsigs);
 
                        /* BIND910: not used */
                        ND_TCHECK(grbn->nsigs);
 
                        /* BIND910: not used */