Deleted Added
full compact
netdissect.h (242485) netdissect.h (252283)
1/*
2 * Copyright (c) 1988-1997
3 * The Regents of the University of California. All rights reserved.
4 *
1/*
2 * Copyright (c) 1988-1997
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Copyright (c) 1998-2004 Michael Richardson <mcr@tcpdump.org>
5 * Copyright (c) 1998-2012 Michael Richardson <mcr@tcpdump.org>
6 * The TCPDUMP project
7 *
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that: (1) source code distributions
10 * retain the above copyright notice and this paragraph in its entirety, (2)
11 * distributions including binary code include the above copyright notice and
12 * this paragraph in its entirety in the documentation or other materials
13 * provided with the distribution, and (3) all advertising materials mentioning

--- 91 unchanged lines hidden (view full) ---

105 */
106 int ndo_Bflag; /* buffer size */
107 int ndo_Iflag; /* rfmon (monitor) mode */
108 int ndo_Oflag; /* run filter code optimizer */
109 int ndo_dlt; /* if != -1, ask libpcap for the DLT it names*/
110 int ndo_jflag; /* packet time stamp source */
111 int ndo_pflag; /* don't go promiscuous */
112
6 * The TCPDUMP project
7 *
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that: (1) source code distributions
10 * retain the above copyright notice and this paragraph in its entirety, (2)
11 * distributions including binary code include the above copyright notice and
12 * this paragraph in its entirety in the documentation or other materials
13 * provided with the distribution, and (3) all advertising materials mentioning

--- 91 unchanged lines hidden (view full) ---

105 */
106 int ndo_Bflag; /* buffer size */
107 int ndo_Iflag; /* rfmon (monitor) mode */
108 int ndo_Oflag; /* run filter code optimizer */
109 int ndo_dlt; /* if != -1, ask libpcap for the DLT it names*/
110 int ndo_jflag; /* packet time stamp source */
111 int ndo_pflag; /* don't go promiscuous */
112
113 int ndo_Cflag; /* rotate dump files after this many bytes */
113 int ndo_Cflag; /* rotate dump files after this many bytes */
114 int ndo_Cflag_count; /* Keep track of which file number we're writing */
115 int ndo_Gflag; /* rotate dump files after this many seconds */
116 int ndo_Gflag_count; /* number of files created with Gflag rotation */
117 time_t ndo_Gflag_time; /* The last time_t the dump file was rotated. */
118 int ndo_Wflag; /* recycle output files after this number of files */
119 int ndo_WflagChars;
120 int ndo_Hflag; /* dissect 802.11s draft mesh standard */
121 int ndo_suppress_default_print; /* don't use default_print() for unknown packet types */

--- 50 unchanged lines hidden (view full) ---

172
173#define PT_VAT 1 /* Visual Audio Tool */
174#define PT_WB 2 /* distributed White Board */
175#define PT_RPC 3 /* Remote Procedure Call */
176#define PT_RTP 4 /* Real-Time Applications protocol */
177#define PT_RTCP 5 /* Real-Time Applications control protocol */
178#define PT_SNMP 6 /* Simple Network Management Protocol */
179#define PT_CNFP 7 /* Cisco NetFlow protocol */
114 int ndo_Cflag_count; /* Keep track of which file number we're writing */
115 int ndo_Gflag; /* rotate dump files after this many seconds */
116 int ndo_Gflag_count; /* number of files created with Gflag rotation */
117 time_t ndo_Gflag_time; /* The last time_t the dump file was rotated. */
118 int ndo_Wflag; /* recycle output files after this number of files */
119 int ndo_WflagChars;
120 int ndo_Hflag; /* dissect 802.11s draft mesh standard */
121 int ndo_suppress_default_print; /* don't use default_print() for unknown packet types */

--- 50 unchanged lines hidden (view full) ---

172
173#define PT_VAT 1 /* Visual Audio Tool */
174#define PT_WB 2 /* distributed White Board */
175#define PT_RPC 3 /* Remote Procedure Call */
176#define PT_RTP 4 /* Real-Time Applications protocol */
177#define PT_RTCP 5 /* Real-Time Applications control protocol */
178#define PT_SNMP 6 /* Simple Network Management Protocol */
179#define PT_CNFP 7 /* Cisco NetFlow protocol */
180#define PT_TFTP 8 /* trivial file transfer protocol */
181#define PT_AODV 9 /* Ad-hoc On-demand Distance Vector Protocol */
182#define PT_CARP 10 /* Common Address Redundancy Protocol */
183#define PT_RADIUS 11 /* RADIUS authentication Protocol */
184#define PT_ZMTP1 12 /* ZeroMQ Message Transport Protocol 1.0 */
185#define PT_VXLAN 13 /* Virtual eXtensible Local Area Network */
180
181#ifndef min
182#define min(a,b) ((a)>(b)?(b):(a))
183#endif
184#ifndef max
185#define max(a,b) ((b)>(a)?(b):(a))
186#endif
187

--- 41 unchanged lines hidden (view full) ---

229#define ND_TCHECK2(var, l) if (!ND_TTEST2(var, l)) goto trunc
230
231/* Bail if "var" was not captured */
232#define ND_TCHECK(var) ND_TCHECK2(var, sizeof(var))
233
234#define ND_PRINT(STUFF) (*ndo->ndo_printf)STUFF
235#define ND_DEFAULTPRINT(ap, length) (*ndo->ndo_default_print)(ndo, ap, length)
236
186
187#ifndef min
188#define min(a,b) ((a)>(b)?(b):(a))
189#endif
190#ifndef max
191#define max(a,b) ((b)>(a)?(b):(a))
192#endif
193

--- 41 unchanged lines hidden (view full) ---

235#define ND_TCHECK2(var, l) if (!ND_TTEST2(var, l)) goto trunc
236
237/* Bail if "var" was not captured */
238#define ND_TCHECK(var) ND_TCHECK2(var, sizeof(var))
239
240#define ND_PRINT(STUFF) (*ndo->ndo_printf)STUFF
241#define ND_DEFAULTPRINT(ap, length) (*ndo->ndo_default_print)(ndo, ap, length)
242
237#if 0
243#if 0
238extern void ts_print(netdissect_options *ipdo,
239 const struct timeval *);
240extern void relts_print(int);
241#endif
242
243extern int fn_print(const u_char *, const u_char *);
244extern int fn_printn(const u_char *, u_int, const u_char *);
245extern const char *tok2str(const struct tok *, const char *, int);

--- 30 unchanged lines hidden (view full) ---

276extern if_printer lookup_printer(int);
277
278extern void eap_print(netdissect_options *,const u_char *, u_int);
279extern int esp_print(netdissect_options *,
280 register const u_char *bp, int len, register const u_char *bp2,
281 int *nhdr, int *padlen);
282extern void arp_print(netdissect_options *,const u_char *, u_int, u_int);
283extern void tipc_print(netdissect_options *, const u_char *, u_int, u_int);
244extern void ts_print(netdissect_options *ipdo,
245 const struct timeval *);
246extern void relts_print(int);
247#endif
248
249extern int fn_print(const u_char *, const u_char *);
250extern int fn_printn(const u_char *, u_int, const u_char *);
251extern const char *tok2str(const struct tok *, const char *, int);

--- 30 unchanged lines hidden (view full) ---

282extern if_printer lookup_printer(int);
283
284extern void eap_print(netdissect_options *,const u_char *, u_int);
285extern int esp_print(netdissect_options *,
286 register const u_char *bp, int len, register const u_char *bp2,
287 int *nhdr, int *padlen);
288extern void arp_print(netdissect_options *,const u_char *, u_int, u_int);
289extern void tipc_print(netdissect_options *, const u_char *, u_int, u_int);
290extern void msnlb_print(netdissect_options *, const u_char *, u_int);
284extern void icmp6_print(netdissect_options *ndo, const u_char *,
285 u_int, const u_char *, int);
286extern void isakmp_print(netdissect_options *,const u_char *,
287 u_int, const u_char *);
288extern void isakmp_rfc3948_print(netdissect_options *,const u_char *,
289 u_int, const u_char *);
290extern void ip_print(netdissect_options *,const u_char *, u_int);
291extern void ip_print_inner(netdissect_options *ndo,
292 const u_char *bp, u_int length, u_int nh,
293 const u_char *bp2);
294extern void rrcp_print(netdissect_options *,const u_char *, u_int);
295
296extern void ether_print(netdissect_options *,
297 const u_char *, u_int, u_int,
298 void (*)(netdissect_options *, const u_char *),
299 const u_char *);
300
291extern void icmp6_print(netdissect_options *ndo, const u_char *,
292 u_int, const u_char *, int);
293extern void isakmp_print(netdissect_options *,const u_char *,
294 u_int, const u_char *);
295extern void isakmp_rfc3948_print(netdissect_options *,const u_char *,
296 u_int, const u_char *);
297extern void ip_print(netdissect_options *,const u_char *, u_int);
298extern void ip_print_inner(netdissect_options *ndo,
299 const u_char *bp, u_int length, u_int nh,
300 const u_char *bp2);
301extern void rrcp_print(netdissect_options *,const u_char *, u_int);
302
303extern void ether_print(netdissect_options *,
304 const u_char *, u_int, u_int,
305 void (*)(netdissect_options *, const u_char *),
306 const u_char *);
307
301extern u_int ether_if_print(netdissect_options *,
308extern u_int ether_if_print(netdissect_options *,
302 const struct pcap_pkthdr *,const u_char *);
309 const struct pcap_pkthdr *,const u_char *);
303extern u_int netanalyzer_if_print(netdissect_options *,
310extern u_int netanalyzer_if_print(netdissect_options *,
304 const struct pcap_pkthdr *,const u_char *);
311 const struct pcap_pkthdr *,const u_char *);
305extern u_int netanalyzer_transparent_if_print(netdissect_options *,
312extern u_int netanalyzer_transparent_if_print(netdissect_options *,
306 const struct pcap_pkthdr *,
307 const u_char *);
308
309extern int ethertype_print(netdissect_options *,u_short, const u_char *,
310 u_int, u_int);
311
312/* stuff that has not yet been rototiled */
313#if 0

--- 88 unchanged lines hidden (view full) ---

402
403extern void raw_if_print(u_char *,
404 const struct pcap_pkthdr *, const u_char *);
405
406extern void rip_print(netdissect_options *,const u_char *, u_int);
407extern void rpki_rtr_print(netdissect_options *,const u_char *, u_int);
408
409extern void sctp_print(netdissect_options *ndo,
313 const struct pcap_pkthdr *,
314 const u_char *);
315
316extern int ethertype_print(netdissect_options *,u_short, const u_char *,
317 u_int, u_int);
318
319/* stuff that has not yet been rototiled */
320#if 0

--- 88 unchanged lines hidden (view full) ---

409
410extern void raw_if_print(u_char *,
411 const struct pcap_pkthdr *, const u_char *);
412
413extern void rip_print(netdissect_options *,const u_char *, u_int);
414extern void rpki_rtr_print(netdissect_options *,const u_char *, u_int);
415
416extern void sctp_print(netdissect_options *ndo,
410 const u_char *bp, const u_char *bp2,
417 const u_char *bp, const u_char *bp2,
411 u_int sctpPacketLength);
412
413extern void sl_if_print(u_char *,const struct pcap_pkthdr *, const u_char *);
414
415extern void lane_if_print(u_char *,const struct pcap_pkthdr *,const u_char *);
416extern void cip_if_print(u_char *,const struct pcap_pkthdr *,const u_char *);
417extern void sl_bsdos_if_print(u_char *,
418 const struct pcap_pkthdr *, const u_char *);

--- 90 unchanged lines hidden ---
418 u_int sctpPacketLength);
419
420extern void sl_if_print(u_char *,const struct pcap_pkthdr *, const u_char *);
421
422extern void lane_if_print(u_char *,const struct pcap_pkthdr *,const u_char *);
423extern void cip_if_print(u_char *,const struct pcap_pkthdr *,const u_char *);
424extern void sl_bsdos_if_print(u_char *,
425 const struct pcap_pkthdr *, const u_char *);

--- 90 unchanged lines hidden ---