diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-16 03:16:55 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-16 03:16:55 +0000 |
| commit | fbb5b30ceb79ceaaaf39042a9fc18072b63242bc (patch) | |
| tree | e1d560ce99307cf69fe1a2ee7254fcb971d856ec /wiretap | |
| parent | 3c0ebfbfe300dc37fdf3580fdaee535739158a3e (diff) | |
Support per packet dumping in wtap_encap_string() and wtap_encap_short_string().
svn path=/trunk/; revision=28752
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/wtap.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 976dacccdc..49449000d9 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -91,7 +91,7 @@ struct encap_type_info { static struct encap_type_info encap_table_base[] = { /* WTAP_ENCAP_UNKNOWN */ - { "Unknown", NULL }, + { "Unknown", "unknown" }, /* WTAP_ENCAP_ETHERNET */ { "Ethernet", "ether" }, @@ -489,8 +489,10 @@ int wtap_register_encap_type(char* name, char* short_name) { const char *wtap_encap_string(int encap) { - if (encap < 0 || encap >= WTAP_NUM_ENCAP_TYPES) - return NULL; + if (encap < WTAP_ENCAP_PER_PACKET || encap >= WTAP_NUM_ENCAP_TYPES) + return "Illegal"; + else if (encap == WTAP_ENCAP_PER_PACKET) + return "Per packet"; else return encap_table[encap].name; } @@ -499,8 +501,10 @@ const char const char *wtap_encap_short_string(int encap) { - if (encap < 0 || encap >= WTAP_NUM_ENCAP_TYPES) - return NULL; + if (encap < WTAP_ENCAP_PER_PACKET || encap >= WTAP_NUM_ENCAP_TYPES) + return "illegal"; + else if (encap == WTAP_ENCAP_PER_PACKET) + return "per-packet"; else return encap_table[encap].short_name; } |