diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2006-03-30 04:58:06 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2006-03-30 04:58:06 +0000 |
| commit | 901f07af6028383568443bc6a76f9ac7c61ace68 (patch) | |
| tree | 4620fb35ad13fe6d4db825347883c8f5ad07004e /wiretap | |
| parent | 015b486dc97bde1fc178d4e3cd741e9e5ca52d9d (diff) | |
From Martin Mathieson:
wiretap/README.developer
- the referenced default seek_read function doesn't exist now
wiretap/wtap.c
- a "hole" in encap_table was causing the wrong encap value for later
types to be looked up (by name)
mergecap.c
- fix a couple of program name copy+paste errors from editcap.c
svn path=/trunk/; revision=17765
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/README.developer | 3 | ||||
| -rw-r--r-- | wiretap/wtap.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/wiretap/README.developer b/wiretap/README.developer index 457038ff78..f2c152c8a2 100644 --- a/wiretap/README.developer +++ b/wiretap/README.developer @@ -23,8 +23,7 @@ To add the ability to read a new capture file format, you have to: write a "seek and read" routine, if necessary, and have the "open" routine set the "subtype_seek_read" member of the "wtap" - structure to point to that routine, otherwise set it to - "wtap_def_seek_read"; + structure to point to that routine. write a "close" routine, if necessary (if, for example, the "open" routine allocates any memory), and set the diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 3400ff1a05..8e1137151f 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -351,6 +351,9 @@ static const struct encap_type_info { /* WTAP_ENCAP_JUNIPER_CHDLC */ { "Juniper C-HDLC", "juniper-chdlc" }, + + /* WTAP_ENCAP_JUNIPER_GGSN */ + { "Juniper GGSN", "juniper-ggsn" }, /* WTAP_ENCAP_LINUX_LAPD */ { "LAPD", "lapd" }, |