Fixtypo.

[tcpdump] / print-decnet.c

diff --git a/print-decnet.c b/print-decnet.c
index d264373f36c8fe69cf3626176f53cf360dcd7cfa..7606d5c2f159b53fbc9f2717bf701066ee3056a9 100644 (file)
--- a/print-decnet.c
+++ b/print-decnet.c
@@ -22,18 +22,15 @@
 /* \summary: DECnet printer */
 
 #ifdef HAVE_CONFIG_H
 /* \summary: DECnet printer */
 
 #ifdef HAVE_CONFIG_H

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

 #endif
 
 #endif
 

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

 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

-struct mbuf;
-struct rtentry;
-

 #ifdef HAVE_DNET_HTOA
   #ifdef HAVE_NETDNET_DN_H
     #include <netdnet/dn.h>
 #ifdef HAVE_DNET_HTOA
   #ifdef HAVE_NETDNET_DN_H
     #include <netdnet/dn.h>


@@ -528,7 +525,7 @@ decnet_print(netdissect_options *ndo,
        length = pktlen;
 
        rhp = (const union routehdr *)(ap + sizeof(short));
        length = pktlen;
 
        rhp = (const union routehdr *)(ap + sizeof(short));

-       ND_TCHECK(rhp->rh_short.sh_flags);
+       ND_TCHECK_1(rhp->rh_short.sh_flags);

        mflags = EXTRACT_U_1(rhp->rh_short.sh_flags);
 
        if (mflags & RMF_PAD) {
        mflags = EXTRACT_U_1(rhp->rh_short.sh_flags);
 
        if (mflags & RMF_PAD) {


@@ -545,7 +542,7 @@ decnet_print(netdissect_options *ndo,
            length -= padlen;
            caplen -= padlen;
            rhp = (const union routehdr *)(ap + sizeof(short));
            length -= padlen;
            caplen -= padlen;
            rhp = (const union routehdr *)(ap + sizeof(short));

-           ND_TCHECK(rhp->rh_short.sh_flags);
+           ND_TCHECK_1(rhp->rh_short.sh_flags);

            mflags = EXTRACT_U_1(rhp->rh_short.sh_flags);
        }
 
            mflags = EXTRACT_U_1(rhp->rh_short.sh_flags);
        }
 


@@ -568,7 +565,7 @@ decnet_print(netdissect_options *ndo,
                ND_PRINT("%s", tstr);
                return;
            }
                ND_PRINT("%s", tstr);
                return;
            }

-           ND_TCHECK(rhp->rh_long);
+           ND_TCHECK_SIZE(&rhp->rh_long);

            dst =
                EXTRACT_LE_U_2(rhp->rh_long.lg_dst.dne_remote.dne_nodeaddr);
            src =
            dst =
                EXTRACT_LE_U_2(rhp->rh_long.lg_dst.dne_remote.dne_nodeaddr);
            src =


@@ -578,7 +575,7 @@ decnet_print(netdissect_options *ndo,
            nsplen = length - sizeof(struct longhdr);
            break;
        case RMF_SHORT:
            nsplen = length - sizeof(struct longhdr);
            break;
        case RMF_SHORT:

-           ND_TCHECK(rhp->rh_short);
+           ND_TCHECK_SIZE(&rhp->rh_short);

            dst = EXTRACT_LE_U_2(rhp->rh_short.sh_dst);
            src = EXTRACT_LE_U_2(rhp->rh_short.sh_src);
            hops = (EXTRACT_U_1(rhp->rh_short.sh_visits) & VIS_MASK)+1;
            dst = EXTRACT_LE_U_2(rhp->rh_short.sh_dst);
            src = EXTRACT_LE_U_2(rhp->rh_short.sh_src);
            hops = (EXTRACT_U_1(rhp->rh_short.sh_visits) & VIS_MASK)+1;


@@ -631,7 +628,7 @@ print_decnet_ctlmsg(netdissect_options *ndo,
            ND_PRINT("init ");
            if (length < sizeof(struct initmsg))
                goto trunc;
            ND_PRINT("init ");
            if (length < sizeof(struct initmsg))
                goto trunc;

-           ND_TCHECK(cmp->cm_init);
+           ND_TCHECK_SIZE(&cmp->cm_init);

            src = EXTRACT_LE_U_2(cmp->cm_init.in_src);
            info = EXTRACT_U_1(cmp->cm_init.in_info);
            blksize = EXTRACT_LE_U_2(cmp->cm_init.in_blksize);
            src = EXTRACT_LE_U_2(cmp->cm_init.in_src);
            info = EXTRACT_U_1(cmp->cm_init.in_info);
            blksize = EXTRACT_LE_U_2(cmp->cm_init.in_blksize);


@@ -649,7 +646,7 @@ print_decnet_ctlmsg(netdissect_options *ndo,
            ND_PRINT("verification ");
            if (length < sizeof(struct verifmsg))
                goto trunc;
            ND_PRINT("verification ");
            if (length < sizeof(struct verifmsg))
                goto trunc;

-           ND_TCHECK(cmp->cm_ver);
+           ND_TCHECK_SIZE(&cmp->cm_ver);

            src = EXTRACT_LE_U_2(cmp->cm_ver.ve_src);
            other = EXTRACT_U_1(cmp->cm_ver.ve_fcnval);
            ND_PRINT("src %s fcnval %o", dnaddr_string(ndo, src), other);
            src = EXTRACT_LE_U_2(cmp->cm_ver.ve_src);
            other = EXTRACT_U_1(cmp->cm_ver.ve_fcnval);
            ND_PRINT("src %s fcnval %o", dnaddr_string(ndo, src), other);


@@ -659,7 +656,7 @@ print_decnet_ctlmsg(netdissect_options *ndo,
            ND_PRINT("test ");
            if (length < sizeof(struct testmsg))
                goto trunc;
            ND_PRINT("test ");
            if (length < sizeof(struct testmsg))
                goto trunc;

-           ND_TCHECK(cmp->cm_test);
+           ND_TCHECK_SIZE(&cmp->cm_test);

            src = EXTRACT_LE_U_2(cmp->cm_test.te_src);
            other = EXTRACT_U_1(cmp->cm_test.te_data);
            ND_PRINT("src %s data %o", dnaddr_string(ndo, src), other);
            src = EXTRACT_LE_U_2(cmp->cm_test.te_src);
            other = EXTRACT_U_1(cmp->cm_test.te_data);
            ND_PRINT("src %s data %o", dnaddr_string(ndo, src), other);


@@ -669,7 +666,7 @@ print_decnet_ctlmsg(netdissect_options *ndo,
            ND_PRINT("lev-1-routing ");
            if (length < sizeof(struct l1rout))
                goto trunc;
            ND_PRINT("lev-1-routing ");
            if (length < sizeof(struct l1rout))
                goto trunc;

-           ND_TCHECK(cmp->cm_l1rou);
+           ND_TCHECK_SIZE(&cmp->cm_l1rou);

            src = EXTRACT_LE_U_2(cmp->cm_l1rou.r1_src);
            ND_PRINT("src %s ", dnaddr_string(ndo, src));
            ret = print_l1_routes(ndo, &(rhpx[sizeof(struct l1rout)]),
            src = EXTRACT_LE_U_2(cmp->cm_l1rou.r1_src);
            ND_PRINT("src %s ", dnaddr_string(ndo, src));
            ret = print_l1_routes(ndo, &(rhpx[sizeof(struct l1rout)]),


@@ -679,7 +676,7 @@ print_decnet_ctlmsg(netdissect_options *ndo,
            ND_PRINT("lev-2-routing ");
            if (length < sizeof(struct l2rout))
                goto trunc;
            ND_PRINT("lev-2-routing ");
            if (length < sizeof(struct l2rout))
                goto trunc;

-           ND_TCHECK(cmp->cm_l2rout);
+           ND_TCHECK_SIZE(&cmp->cm_l2rout);

            src = EXTRACT_LE_U_2(cmp->cm_l2rout.r2_src);
            ND_PRINT("src %s ", dnaddr_string(ndo, src));
            ret = print_l2_routes(ndo, &(rhpx[sizeof(struct l2rout)]),
            src = EXTRACT_LE_U_2(cmp->cm_l2rout.r2_src);
            ND_PRINT("src %s ", dnaddr_string(ndo, src));
            ret = print_l2_routes(ndo, &(rhpx[sizeof(struct l2rout)]),


@@ -689,7 +686,7 @@ print_decnet_ctlmsg(netdissect_options *ndo,
            ND_PRINT("router-hello ");
            if (length < sizeof(struct rhellomsg))
                goto trunc;
            ND_PRINT("router-hello ");
            if (length < sizeof(struct rhellomsg))
                goto trunc;

-           ND_TCHECK(cmp->cm_rhello);
+           ND_TCHECK_SIZE(&cmp->cm_rhello);

            vers = EXTRACT_U_1(cmp->cm_rhello.rh_vers);
            eco = EXTRACT_U_1(cmp->cm_rhello.rh_eco);
            ueco = EXTRACT_U_1(cmp->cm_rhello.rh_ueco);
            vers = EXTRACT_U_1(cmp->cm_rhello.rh_vers);
            eco = EXTRACT_U_1(cmp->cm_rhello.rh_eco);
            ueco = EXTRACT_U_1(cmp->cm_rhello.rh_ueco);


@@ -711,7 +708,7 @@ print_decnet_ctlmsg(netdissect_options *ndo,
            ND_PRINT("endnode-hello ");
            if (length < sizeof(struct ehellomsg))
                goto trunc;
            ND_PRINT("endnode-hello ");
            if (length < sizeof(struct ehellomsg))
                goto trunc;

-           ND_TCHECK(cmp->cm_ehello);
+           ND_TCHECK_SIZE(&cmp->cm_ehello);

            vers = EXTRACT_U_1(cmp->cm_ehello.eh_vers);
            eco = EXTRACT_U_1(cmp->cm_ehello.eh_eco);
            ueco = EXTRACT_U_1(cmp->cm_ehello.eh_ueco);
            vers = EXTRACT_U_1(cmp->cm_ehello.eh_vers);
            eco = EXTRACT_U_1(cmp->cm_ehello.eh_eco);
            ueco = EXTRACT_U_1(cmp->cm_ehello.eh_ueco);


@@ -879,7 +876,7 @@ print_nsp(netdissect_options *ndo,
 
                    if (nsplen < data_off)
                        goto trunc;
 
                    if (nsplen < data_off)
                        goto trunc;

-                   ND_TCHECK(shp->sh_seq[0]);
+                   ND_TCHECK_2(shp->sh_seq[0]);

                    ack = EXTRACT_LE_U_2(shp->sh_seq[0]);
                    if (ack & SGQ_ACK) {        /* acknum field */
                        if ((ack & SGQ_NAK) == SGQ_NAK)
                    ack = EXTRACT_LE_U_2(shp->sh_seq[0]);
                    if (ack & SGQ_ACK) {        /* acknum field */
                        if ((ack & SGQ_NAK) == SGQ_NAK)


@@ -889,7 +886,7 @@ print_nsp(netdissect_options *ndo,
                        data_off += sizeof(short);
                        if (nsplen < data_off)
                            goto trunc;
                        data_off += sizeof(short);
                        if (nsplen < data_off)
                            goto trunc;

-                       ND_TCHECK(shp->sh_seq[1]);
+                       ND_TCHECK_2(shp->sh_seq[1]);

                        ack = EXTRACT_LE_U_2(shp->sh_seq[1]);
                        if (ack & SGQ_OACK) {   /* ackoth field */
                            if ((ack & SGQ_ONAK) == SGQ_ONAK)
                        ack = EXTRACT_LE_U_2(shp->sh_seq[1]);
                        if (ack & SGQ_OACK) {   /* ackoth field */
                            if ((ack & SGQ_ONAK) == SGQ_ONAK)


@@ -899,7 +896,7 @@ print_nsp(netdissect_options *ndo,
                            data_off += sizeof(short);
                            if (nsplen < data_off)
                                goto trunc;
                            data_off += sizeof(short);
                            if (nsplen < data_off)
                                goto trunc;

-                           ND_TCHECK(shp->sh_seq[2]);
+                           ND_TCHECK_2(shp->sh_seq[2]);

                            ack = EXTRACT_LE_U_2(shp->sh_seq[2]);
                        }
                    }
                            ack = EXTRACT_LE_U_2(shp->sh_seq[2]);
                        }
                    }


@@ -915,7 +912,7 @@ print_nsp(netdissect_options *ndo,
 
                    if (nsplen < data_off)
                        goto trunc;
 
                    if (nsplen < data_off)
                        goto trunc;

-                   ND_TCHECK(shp->sh_seq[0]);
+                   ND_TCHECK_2(shp->sh_seq[0]);

                    ack = EXTRACT_LE_U_2(shp->sh_seq[0]);
                    if (ack & SGQ_ACK) {        /* acknum field */
                        if ((ack & SGQ_NAK) == SGQ_NAK)
                    ack = EXTRACT_LE_U_2(shp->sh_seq[0]);
                    if (ack & SGQ_ACK) {        /* acknum field */
                        if ((ack & SGQ_NAK) == SGQ_NAK)


@@ -925,7 +922,7 @@ print_nsp(netdissect_options *ndo,
                        data_off += sizeof(short);
                        if (nsplen < data_off)
                            goto trunc;
                        data_off += sizeof(short);
                        if (nsplen < data_off)
                            goto trunc;

-                       ND_TCHECK(shp->sh_seq[1]);
+                       ND_TCHECK_2(shp->sh_seq[1]);

                        ack = EXTRACT_LE_U_2(shp->sh_seq[1]);
                        if (ack & SGQ_OACK) {   /* ackdat field */
                            if ((ack & SGQ_ONAK) == SGQ_ONAK)
                        ack = EXTRACT_LE_U_2(shp->sh_seq[1]);
                        if (ack & SGQ_OACK) {   /* ackdat field */
                            if ((ack & SGQ_ONAK) == SGQ_ONAK)


@@ -935,7 +932,7 @@ print_nsp(netdissect_options *ndo,
                            data_off += sizeof(short);
                            if (nsplen < data_off)
                                goto trunc;
                            data_off += sizeof(short);
                            if (nsplen < data_off)
                                goto trunc;

-                           ND_TCHECK(shp->sh_seq[2]);
+                           ND_TCHECK_2(shp->sh_seq[2]);

                            ack = EXTRACT_LE_U_2(shp->sh_seq[2]);
                        }
                    }
                            ack = EXTRACT_LE_U_2(shp->sh_seq[2]);
                        }
                    }


@@ -953,21 +950,21 @@ print_nsp(netdissect_options *ndo,
 
                    if (nsplen < sizeof(struct seghdr) + sizeof(struct lsmsg))
                        goto trunc;
 
                    if (nsplen < sizeof(struct seghdr) + sizeof(struct lsmsg))
                        goto trunc;

-                   ND_TCHECK(shp->sh_seq[0]);
+                   ND_TCHECK_2(shp->sh_seq[0]);

                    ack = EXTRACT_LE_U_2(shp->sh_seq[0]);
                    if (ack & SGQ_ACK) {        /* acknum field */
                        if ((ack & SGQ_NAK) == SGQ_NAK)
                            ND_PRINT("nak %u ", ack & SGQ_MASK);
                        else
                            ND_PRINT("ack %u ", ack & SGQ_MASK);
                    ack = EXTRACT_LE_U_2(shp->sh_seq[0]);
                    if (ack & SGQ_ACK) {        /* acknum field */
                        if ((ack & SGQ_NAK) == SGQ_NAK)
                            ND_PRINT("nak %u ", ack & SGQ_MASK);
                        else
                            ND_PRINT("ack %u ", ack & SGQ_MASK);

-                       ND_TCHECK(shp->sh_seq[1]);
+                       ND_TCHECK_2(shp->sh_seq[1]);

                        ack = EXTRACT_LE_U_2(shp->sh_seq[1]);
                        if (ack & SGQ_OACK) {   /* ackdat field */
                            if ((ack & SGQ_ONAK) == SGQ_ONAK)
                                ND_PRINT("nakdat %u ", ack & SGQ_MASK);
                            else
                                ND_PRINT("ackdat %u ", ack & SGQ_MASK);
                        ack = EXTRACT_LE_U_2(shp->sh_seq[1]);
                        if (ack & SGQ_OACK) {   /* ackdat field */
                            if ((ack & SGQ_ONAK) == SGQ_ONAK)
                                ND_PRINT("nakdat %u ", ack & SGQ_MASK);
                            else
                                ND_PRINT("ackdat %u ", ack & SGQ_MASK);

-                           ND_TCHECK(shp->sh_seq[2]);
+                           ND_TCHECK_2(shp->sh_seq[2]);

                            ack = EXTRACT_LE_U_2(shp->sh_seq[2]);
                        }
                    }
                            ack = EXTRACT_LE_U_2(shp->sh_seq[2]);
                        }
                    }


@@ -1048,7 +1045,7 @@ print_nsp(netdissect_options *ndo,
                            ND_PRINT("nak %u ", ack & SGQ_MASK);
                        else
                            ND_PRINT("ack %u ", ack & SGQ_MASK);
                            ND_PRINT("nak %u ", ack & SGQ_MASK);
                        else
                            ND_PRINT("ack %u ", ack & SGQ_MASK);

-                       ND_TCHECK(amp->ak_acknum[1]);
+                       ND_TCHECK_2(amp->ak_acknum[1]);

                        ack = EXTRACT_LE_U_2(amp->ak_acknum[1]);
                        if (ack & SGQ_OACK) {   /* ackdat field */
                            if ((ack & SGQ_ONAK) == SGQ_ONAK)
                        ack = EXTRACT_LE_U_2(amp->ak_acknum[1]);
                        if (ack & SGQ_OACK) {   /* ackdat field */
                            if ((ack & SGQ_ONAK) == SGQ_ONAK)