Fix a typo; this fixes bug 1854436.

[libpcap] / gencode.h

diff --git a/gencode.h b/gencode.h
index 441995e6a379d7945bf180be426db783f643b0d4..dc43a07bfb1bbbd5677c813b0f4d9f92ae6e48d5 100644 (file)
--- a/gencode.h
+++ b/gencode.h
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- * @(#) $Header: /tcpdump/master/libpcap/gencode.h,v 1.57 2003-03-11 06:23:53 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/gencode.h,v 1.60.2.11 2007-06-11 09:52:04 guy Exp $ (LBL)

  */
 
 /*
  */
 
 /*


@@ -55,6 +55,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
  * POSSIBILITY OF SUCH DAMAGE.
  */
 

+#ifndef HAVE___ATTRIBUTE__
+#define __attribute__(x)
+#endif /* HAVE___ATTRIBUTE__ */
+

 /* Address qualifiers. */
 
 #define Q_HOST         1
 /* Address qualifiers. */
 
 #define Q_HOST         1


@@ -63,6 +67,7 @@
 #define Q_GATEWAY      4
 #define Q_PROTO                5
 #define Q_PROTOCHAIN   6
 #define Q_GATEWAY      4
 #define Q_PROTO                5
 #define Q_PROTOCHAIN   6

+#define Q_PORTRANGE    7

 
 /* Protocol qualifiers. */
 
 
 /* Protocol qualifiers. */
 


@@ -119,6 +124,8 @@
 #define Q_ISIS_PSNP     38
 #define Q_ISIS_LSP      39
 
 #define Q_ISIS_PSNP     38
 #define Q_ISIS_LSP      39
 

+#define Q_RADIO                40
+

 /* Directional qualifiers. */
 
 #define Q_SRC          1
 /* Directional qualifiers. */
 
 #define Q_SRC          1


@@ -166,6 +173,18 @@
                                   end-to-end circuits, ILMI circuits or
                                   connection signalling circuit. */
 
                                   end-to-end circuits, ILMI circuits or
                                   connection signalling circuit. */
 

+/* MTP2 types */
+#define M_FISU         22      /* FISU */
+#define M_LSSU         23      /* LSSU */
+#define M_MSU          24      /* MSU */
+
+/* MTP3 field types */
+#define M_SIO          1
+#define M_OPC          2
+#define M_DPC          3
+#define M_SLS          4
+
+

 struct slist;
 
 struct stmt {
 struct slist;
 
 struct stmt {


@@ -273,30 +292,36 @@ struct block *gen_multicast(int);
 struct block *gen_inbound(int);
 
 struct block *gen_vlan(int);
 struct block *gen_inbound(int);
 
 struct block *gen_vlan(int);

+struct block *gen_mpls(int);
+
+struct block *gen_pppoed(void);
+struct block *gen_pppoes(void);

 
 

-struct block *gen_atmfield_code(int atmfield, bpf_u_int32 jvalue, bpf_u_int32 jtype, int reverse);
+struct block *gen_atmfield_code(int atmfield, bpf_int32 jvalue, bpf_u_int32 jtype, int reverse);

 struct block *gen_atmtype_abbrev(int type);
 struct block *gen_atmmulti_abbrev(int type);
 
 struct block *gen_atmtype_abbrev(int type);
 struct block *gen_atmmulti_abbrev(int type);
 

-struct block *gen_pf_ifname(char *);
+struct block *gen_mtp2type_abbrev(int type);
+struct block *gen_mtp3field_code(int mtp3field, bpf_u_int32 jvalue, bpf_u_int32 jtype, int reverse);
+
+struct block *gen_pf_ifname(const char *);

 struct block *gen_pf_rnr(int);
 struct block *gen_pf_rnr(int);

+struct block *gen_pf_srnr(int);
+struct block *gen_pf_ruleset(char *);

 struct block *gen_pf_reason(int);
 struct block *gen_pf_action(int);
 struct block *gen_pf_dir(int);
 
 void bpf_optimize(struct block **);
 void bpf_error(const char *, ...)
 struct block *gen_pf_reason(int);
 struct block *gen_pf_action(int);
 struct block *gen_pf_dir(int);
 
 void bpf_optimize(struct block **);
 void bpf_error(const char *, ...)

-#if HAVE___ATTRIBUTE__
-    __attribute__((noreturn, format (printf, 1, 2)))
-#endif
-;
+    __attribute__((noreturn, format (printf, 1, 2)));

 
 void finish_parse(struct block *);
 char *sdup(const char *);
 
 struct bpf_insn *icode_to_fcode(struct block *, int *);
 int pcap_parse(void);
 
 void finish_parse(struct block *);
 char *sdup(const char *);
 
 struct bpf_insn *icode_to_fcode(struct block *, int *);
 int pcap_parse(void);

-void lex_init(char *);
+void lex_init(const char *);

 void lex_cleanup(void);
 void sappend(struct slist *, struct slist *);
 
 void lex_cleanup(void);
 void sappend(struct slist *, struct slist *);