From 33750ab4b4df833b35a9f141a5089e22c4aa534e Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Fri, 16 May 2014 15:11:11 +0200 Subject: IP Protocol : Update description of IP Protocol From Boaz In IANA the two IPv4 protocols are defined: 35 IDPR Inter-Domain Policy Routing Protocol 45 IDRP Inter-Domain Routing Protocol http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml However, in Wireshark, they are named: { IP_PROTO_IDPR, "Interdomain routing" }, /* 35 IDPR Inter-Domain Policy Routing Protocol [Martha_Steenstrup] */ { IP_PROTO_IDRP, "IDRP" }, /* 45 IDRP Inter-Domain Routing Protocol [Sue_Hares] */ Which is somewhat confusing. I think IDPR should be named "Inter-Domain Policy Routing". And IDRP should be named "Inter-Domain Routing Protocol". Change-Id: I69b34ea8d9b3169fd779357710edb44cfb5cb2b3 Reviewed-on: https://code.wireshark.org/review/1664 Reviewed-by: Anders Broman --- epan/ipproto.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'epan/ipproto.c') diff --git a/epan/ipproto.c b/epan/ipproto.c index 750b8e726f..f6e96abf85 100644 --- a/epan/ipproto.c +++ b/epan/ipproto.c @@ -73,7 +73,7 @@ static const value_string ipproto_val[] = { { IP_PROTO_MERIT, "Merit Internodal" }, /* 32 MERIT-INP MERIT Internodal Protocol [Hans_Werner_Braun] */ { IP_PROTO_DCCP, "Datagram Congestion Control Protocol" }, /* 33 DCCP Datagram Congestion Control Protocol [RFC4340] */ { IP_PROTO_3PC, "3rd Party Connect" }, /* 34 3PC Third Party Connect Protocol [Stuart_A_Friedberg] */ - { IP_PROTO_IDPR, "Interdomain routing" }, /* 35 IDPR Inter-Domain Policy Routing Protocol [Martha_Steenstrup] */ + { IP_PROTO_IDPR, "Inter-Domain Policy Routing Protocol" }, /* 35 IDPR Inter-Domain Policy Routing Protocol [Martha_Steenstrup] */ { IP_PROTO_XTP, "XTP" }, /* 36 XTP XTP [Greg_Chesson] */ { IP_PROTO_DDP, "Datagram delivery"}, /* 37 DDP Datagram Delivery Protocol [Wesley_Craig] */ { IP_PROTO_CMTP, "Control Message" }, /* 38 IDPR-CMTP IDPR Control Message Transport Proto [Martha_Steenstrup] */ @@ -83,13 +83,13 @@ static const value_string ipproto_val[] = { { IP_PROTO_SDRP, "Source demand routing" }, /* 42 SDRP Source Demand Routing Protocol [Deborah_Estrin] */ { IP_PROTO_ROUTING, "IPv6 routing" }, /* 43 IPv6-Route Routing Header for IPv6 [Steve_Deering] */ { IP_PROTO_FRAGMENT,"IPv6 fragment" }, /* 44 IPv6-Frag Fragment Header for IPv6 [Steve_Deering] */ - { IP_PROTO_IDRP, "IDRP" }, /* 45 IDRP Inter-Domain Routing Protocol [Sue_Hares] */ - { IP_PROTO_RSVP, "RSVP" }, /* 46 RSVP Reservation Protocol [Bob_Braden] */ - { IP_PROTO_GRE, "GRE" }, /* 47 GRE General Routing Encapsulation [Tony_Li] */ + { IP_PROTO_IDRP, "Inter-Domain Routing Protocol" }, /* 45 IDRP Inter-Domain Routing Protocol [Sue_Hares] */ + { IP_PROTO_RSVP, "Reservation Protocol" }, /* 46 RSVP Reservation Protocol [Bob_Braden] */ + { IP_PROTO_GRE, "Generic Routing Encapsulation" }, /* 47 GRE General Routing Encapsulation [Tony_Li] */ { IP_PROTO_DSR, "Dynamic source routing" }, /* 48 DSR Dynamic Source Routing Protocol [RFC4728] */ { IP_PROTO_BNA, "BNA" }, /* 49 BNA BNA [Gary Salamon] */ - { IP_PROTO_ESP, "ESP" }, /* 50 ESP Encap Security Payload [RFC4303] */ - { IP_PROTO_AH, "AH" }, /* 51 AH Authentication Header [RFC4302] */ + { IP_PROTO_ESP, "Encap Security Payload" }, /* 50 ESP Encap Security Payload [RFC4303] */ + { IP_PROTO_AH, "Authentication Header" }, /* 51 AH Authentication Header [RFC4302] */ { IP_PROTO_INSLP, "INSLP" }, /* 52 I-NLSP Integrated Net Layer Security TUBA [K_Robert_Glenn] */ { IP_PROTO_SWIPE, "SWIPE" }, /* 53 SWIPE IP with Encryption [John_Ioannidis] */ { IP_PROTO_NARP, "NBMA ARP"}, /* 54 NARP NBMA Address Resolution Protocol [RFC1735] */ -- cgit v1.2.1