Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

L2TP dissector changes, from Motonori Shindo:

  o completely TCHECK()-ified
  o PPP disconnect cause info AVP support added (RFC3145)
  o use u_int16_t/u_int32_t instead of u_short/u_int
  o use tok2str() to better support discrete array
  o fixed bug (Authen Name AVP is now decoded as a string)
  o code clean up
  • Loading branch information...
commit de390b1f7ebc797bb4fd32ea6256bb9d63f963d3 1 parent b263fd4
yuguy authored November 05, 2001

Showing 2 changed files with 372 additions and 413 deletions. Show diff stats Hide diff stats

  1. 25  l2tp.h
  2. 760  print-l2tp.c
25  l2tp.h
... ...
@@ -1,4 +1,4 @@
1  
-/* @(#) $Header: /tcpdump/master/tcpdump/l2tp.h,v 1.4 2000-12-17 23:07:49 guy Exp $ (LBL) */
  1
+/* @(#) $Header: /tcpdump/master/tcpdump/l2tp.h,v 1.5 2001-11-05 10:03:27 guy Exp $ (LBL) */
2 2
 /*
3 3
  * Copyright (c) 1991, 1993, 1994, 1995, 1996, 1997
4 4
  *      The Regents of the University of California.  All rights reserved.
@@ -55,29 +55,8 @@
55 55
 #define L2TP_AUTHEN_TYPE_CHAP		0x0002	/* PPP CHAP */
56 56
 #define L2TP_AUTHEN_TYPE_PAP		0x0003	/* PPP PAP */
57 57
 #define L2TP_AUTHEN_TYPE_NO_AUTH	0x0004	/* No Authentication */
58  
-#define L2TP_AUTHEN_TYPE_MSCHAP		0x0005	/* MSCHAPv1 */
  58
+#define L2TP_AUTHEN_TYPE_MSCHAPv1	0x0005	/* MSCHAPv1 */
59 59
 
60 60
 #define L2TP_PROXY_AUTH_ID_MASK		0x00ff
61 61
 
62 62
 
63  
-struct l2tp_avp_vec {
64  
-	const char *name;
65  
-	void (*print)(const u_char *, u_int32_t);	
66  
-};
67  
-		
68  
-struct l2tp_call_errors {
69  
-	u_int16_t	reserved;
70  
-	u_int32_t	crc_errs;
71  
-	u_int32_t	framing_errs;	
72  
-	u_int32_t	hardware_overruns;	
73  
-	u_int32_t	buffer_overruns;
74  
-	u_int32_t	timeout_errs;	
75  
-	u_int32_t	alignment_errs;	
76  
-};
77  
-
78  
-struct l2tp_accm {
79  
-	u_int16_t 	reserved;
80  
-	u_int32_t	send_accm;
81  
-	u_int32_t	recv_accm;
82  
-};
83  
-
760  print-l2tp.c
@@ -23,7 +23,7 @@
@@ -49,111 +49,145 @@ static char tstr[] = " [|l2tp]";
@@ -227,57 +261,53 @@ print_octets(const u_char *dat, u_int length)
@@ -288,9 +318,9 @@ l2tp_framing_cap_print(const u_char *dat, u_int length)
@@ -301,51 +331,9 @@ l2tp_bearer_cap_print(const u_char *dat, u_int length)
@@ -354,39 +342,9 @@ l2tp_q931_cc_print(const u_char *dat, u_int length)
@@ -397,9 +355,9 @@ l2tp_bearer_type_print(const u_char *dat, u_int length)
@@ -410,241 +368,251 @@ l2tp_framing_type_print(const u_char *dat, u_int length)
@@ -682,24 +650,31 @@ l2tp_print(const u_char *dat, u_int length)
@@ -716,4 +691,9 @@ l2tp_print(const u_char *dat, u_int length)

0 notes on commit de390b1

Please sign in to comment.
Something went wrong with that request. Please try again.