add basic skeleton for printing olsr packets as per rfc3626

[tcpdump] / print-udp.c

diff --git a/print-udp.c b/print-udp.c
index 1875dc8c309933c0cc849efd0bcd4c5dece9a8aa..2f7ffc771c8e0a8cb1c11e64dd4044577b574f5f 100644 (file)
--- a/print-udp.c
+++ b/print-udp.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
 
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.134 2004-10-29 11:42:54 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.140 2007-03-27 10:44:09 hannes Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -35,8 +35,6 @@ static const char rcsid[] _U_ =
 #endif
 #include <arpa/tftp.h>
 
 #endif
 #include <arpa/tftp.h>
 

-#include <rpc/rpc.h>
-

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


@@ -52,6 +50,8 @@ static const char rcsid[] _U_ =
 #include "ip6.h"
 #endif
 #include "ipproto.h"
 #include "ip6.h"
 #endif
 #include "ipproto.h"

+#include "rpc_auth.h"
+#include "rpc_msg.h"

 
 #include "nameser.h"
 #include "nfs.h"
 
 #include "nameser.h"
 #include "nfs.h"


@@ -468,8 +468,8 @@ udp_print(register const u_char *bp, u_int length,
                return;
        }
        if (packettype) {
                return;
        }
        if (packettype) {

-               register struct rpc_msg *rp;
-               enum msg_type direction;
+               register struct sunrpc_msg *rp;
+               enum sunrpc_msg_type direction;

 
                switch (packettype) {
 
 
                switch (packettype) {
 


@@ -484,9 +484,9 @@ udp_print(register const u_char *bp, u_int length,
                        break;
 
                case PT_RPC:
                        break;
 
                case PT_RPC:

-                       rp = (struct rpc_msg *)(up + 1);
-                       direction = (enum msg_type)EXTRACT_32BITS(&rp->rm_direction);
-                       if (direction == CALL)
+                       rp = (struct sunrpc_msg *)(up + 1);
+                       direction = (enum sunrpc_msg_type)EXTRACT_32BITS(&rp->rm_direction);
+                       if (direction == SUNRPC_CALL)

                                sunrpcrequest_print((u_char *)rp, length,
                                    (u_char *)ip);
                        else
                                sunrpcrequest_print((u_char *)rp, length,
                                    (u_char *)ip);
                        else


@@ -526,7 +526,7 @@ udp_print(register const u_char *bp, u_int length,
 #ifdef INET6
                            ip6 != NULL);
 #else
 #ifdef INET6
                            ip6 != NULL);
 #else

-                           FALSE);
+                           0);

 #endif
                        break;
                }
 #endif
                        break;
                }


@@ -534,24 +534,24 @@ udp_print(register const u_char *bp, u_int length,
        }
 
        if (!qflag) {
        }
 
        if (!qflag) {

-               register struct rpc_msg *rp;
-               enum msg_type direction;
+               register struct sunrpc_msg *rp;
+               enum sunrpc_msg_type direction;

 
 

-               rp = (struct rpc_msg *)(up + 1);
+               rp = (struct sunrpc_msg *)(up + 1);

                if (TTEST(rp->rm_direction)) {
                if (TTEST(rp->rm_direction)) {

-                       direction = (enum msg_type)EXTRACT_32BITS(&rp->rm_direction);
-                       if (dport == NFS_PORT && direction == CALL) {
+                       direction = (enum sunrpc_msg_type)EXTRACT_32BITS(&rp->rm_direction);
+                       if (dport == NFS_PORT && direction == SUNRPC_CALL) {

                                nfsreq_print((u_char *)rp, length,
                                    (u_char *)ip);
                                return;
                        }
                                nfsreq_print((u_char *)rp, length,
                                    (u_char *)ip);
                                return;
                        }

-                       if (sport == NFS_PORT && direction == REPLY) {
+                       if (sport == NFS_PORT && direction == SUNRPC_REPLY) {

                                nfsreply_print((u_char *)rp, length,
                                    (u_char *)ip);
                                return;
                        }
 #ifdef notdef
                                nfsreply_print((u_char *)rp, length,
                                    (u_char *)ip);
                                return;
                        }
 #ifdef notdef

-                       if (dport == SUNRPC_PORT && direction == CALL) {
+                       if (dport == SUNRPC_PORT && direction == SUNRPC_CALL) {

                                sunrpcrequest_print((u_char *)rp, length, (u_char *)ip);
                                return;
                        }
                                sunrpcrequest_print((u_char *)rp, length, (u_char *)ip);
                                return;
                        }


@@ -613,13 +613,15 @@ udp_print(register const u_char *bp, u_int length,
 #ifdef INET6
                            ip6 != NULL);
 #else
 #ifdef INET6
                            ip6 != NULL);
 #else

-                           FALSE);
+                           0);

 #endif
 #endif

-               else if (ISPORT(ISAKMP_PORT))
-                       isakmp_print((const u_char *)(up + 1), length, bp2);
+               else if (ISPORT(ISAKMP_PORT))
+                        isakmp_print(gndo, (const u_char *)(up + 1), length, bp2);
+               else if (ISPORT(ISAKMP_PORT_NATT))
+                        isakmp_rfc3948_print(gndo, (const u_char *)(up + 1), length, bp2);

 #if 1 /*???*/
 #if 1 /*???*/

-               else if (ISPORT(ISAKMP_PORT_USER1) || ISPORT(ISAKMP_PORT_USER2))
-                       isakmp_print((const u_char *)(up + 1), length, bp2);
+               else if (ISPORT(ISAKMP_PORT_USER1) || ISPORT(ISAKMP_PORT_USER2))
+                       isakmp_print(gndo, (const u_char *)(up + 1), length, bp2);

 #endif
                else if (ISPORT(SNMP_PORT) || ISPORT(SNMPTRAP_PORT))
                        snmp_print((const u_char *)(up + 1), length);
 #endif
                else if (ISPORT(SNMP_PORT) || ISPORT(SNMPTRAP_PORT))
                        snmp_print((const u_char *)(up + 1), length);


@@ -672,6 +674,8 @@ udp_print(register const u_char *bp, u_int length,
                        lwres_print((const u_char *)(up + 1), length);
                 else if (ISPORT(LDP_PORT))
                        ldp_print((const u_char *)(up + 1), length);
                        lwres_print((const u_char *)(up + 1), length);
                 else if (ISPORT(LDP_PORT))
                        ldp_print((const u_char *)(up + 1), length);

+                else if (ISPORT(OLSR_PORT))
+                       olsr_print((const u_char *)(up + 1), length);

                 else if (ISPORT(MPLS_LSP_PING_PORT))
                        lspping_print((const u_char *)(up + 1), length);
                else if (dport == BFD_CONTROL_PORT ||
                 else if (ISPORT(MPLS_LSP_PING_PORT))
                        lspping_print((const u_char *)(up + 1), length);
                else if (dport == BFD_CONTROL_PORT ||


@@ -679,6 +683,8 @@ udp_print(register const u_char *bp, u_int length,
                        bfd_print((const u_char *)(up+1), length, dport);
                 else if (ISPORT(LMP_PORT))
                        lmp_print((const u_char *)(up + 1), length);
                        bfd_print((const u_char *)(up+1), length, dport);
                 else if (ISPORT(LMP_PORT))
                        lmp_print((const u_char *)(up + 1), length);

+               else if (ISPORT(VQP_PORT))
+                       vqp_print((const u_char *)(up + 1), length);

                 else if (ISPORT(SIP_PORT))
                        sip_print((const u_char *)(up + 1), length);
                 else if (ISPORT(SYSLOG_PORT))
                 else if (ISPORT(SIP_PORT))
                        sip_print((const u_char *)(up + 1), length);
                 else if (ISPORT(SYSLOG_PORT))


@@ -690,3 +696,12 @@ udp_print(register const u_char *bp, u_int length,
        } else
                (void)printf("UDP, length %u", (u_int32_t)(ulen - sizeof(*up)));
 }
        } else
                (void)printf("UDP, length %u", (u_int32_t)(ulen - sizeof(*up)));
 }

+
+
+/*
+ * Local Variables:
+ * c-style: whitesmith
+ * c-basic-offset: 8
+ * End:
+ */
+