dect
/
libpcap
Archived
13
0
Fork 0
Code Releases Activity

add gencode support for Juniper ML/LS PIC DLT_

This commit is contained in:
hannes 2005-01-12 09:02:55 +00:00
parent 1a66ed9ea7
commit 6e18a333d2
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gencode.c
View File

@ -21,7 +21,7 @@
*/
#ifndef lint
static const char rcsid[] _U_ =
"@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.215 2004-12-18 08:52:09 guy Exp $ (LBL)";
"@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.216 2005-01-12 09:02:55 hannes Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@ -1023,6 +1023,12 @@ init_linktype(p)
off_nl_nosnap = PFLOG_HDRLEN;
return;
case DLT_JUNIPER_MLPPP:
off_linktype = 4;
off_nl = 4;
off_nl_nosnap = -1;
break;
case DLT_JUNIPER_ATM1:
off_linktype = 4; /* in reality variable between 4-8 */
off_nl = 4;
@ -1822,6 +1828,7 @@ gen_linktype(proto)
/*NOTREACHED*/
break;
case DLT_JUNIPER_MLPPP:
case DLT_JUNIPER_ATM1:
case DLT_JUNIPER_ATM2:
/* just lets verify the magic number for now -
@ -5118,6 +5125,7 @@ gen_inbound(dir)
}
break;
case DLT_JUNIPER_MLPPP:
case DLT_JUNIPER_ATM1:
case DLT_JUNIPER_ATM2:
/* juniper flags (including direction) are stored

3
pcap.c
View File

@ -33,7 +33,7 @@
#ifndef lint
static const char rcsid[] _U_ =
"@(#) $Header: /tcpdump/master/libpcap/pcap.c,v 1.81 2004-12-19 20:02:45 guy Exp $ (LBL)";
"@(#) $Header: /tcpdump/master/libpcap/pcap.c,v 1.82 2005-01-12 09:02:55 hannes Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@ -358,6 +358,7 @@ static struct dlt_choice dlt_choices[] = {
DLT_CHOICE(DLT_SYMANTEC_FIREWALL, "Symantec Firewall"),
DLT_CHOICE(DLT_JUNIPER_ATM1, "Juniper ATM1 PIC"),
DLT_CHOICE(DLT_JUNIPER_ATM2, "Juniper ATM2 PIC"),
DLT_CHOICE(DLT_JUNIPER_MLPPP, "Juniper ML/LS PIC"),
DLT_CHOICE(DLT_PPP_WITHDIRECTION, "PPP with direction"),
DLT_CHOICE(DLT_JUNIPER_PPPOE, "Juniper PPPoE"),
DLT_CHOICE(DLT_JUNIPER_PPPOE_ATM, "Juniper PPPoE/ATM"),