Hello,
Here's two minor enhancement patches regarding IPv6.
Could you please review them and commit them to the repository?
packet-dhcpv6.c:
- updated the IETF spec names
- changed Prefix-Delegation related DHCPv6 option
numbers from temporary one to the official one
- fixed typo in DHCPv6 message type
packet-gre.c
- supports IPv6 payload.
Thanks,
----
SUZUKI, Shinsuke @ KAME Project
Index: packet-dhcpv6.c
===================================================================
RCS file: /cvsroot/ethereal/packet-dhcpv6.c,v
retrieving revision 1.9
diff -u -u -r1.9 packet-dhcpv6.c
--- packet-dhcpv6.c 17 Oct 2003 21:26:56 -0000 1.9
+++ packet-dhcpv6.c 29 Jan 2004 01:21:21 -0000
@@ -10,8 +10,8 @@
* The information used comes from:
* RFC3315.txt
* RFC3319.txt
- * draft-ietf-dhc-dhcpv6-opt-prefix-delegation-05.txt
- * draft-ietf-dhc-dhcpv6-opt-dnsconfig-04.txt
+ * RFC3633.txt
+ * RFC3646.txt
* draft-ietf-dhc-dhcpv6-opt-nisconfig-02.txt
* draft-ietf-dhc-dhcpv6-opt-timeconfig-02.txt
* Note that protocol constants are still subject to change, based on IANA
@@ -69,7 +69,7 @@
#define RECONFIGURE 10
#define INFORMATION_REQUEST 11
#define RELAY_FORW 12
-#define RELAY_REPL 13
+#define RELAY_REPLY 13
#define OPTION_CLIENTID 1
#define OPTION_SERVERID 2
@@ -95,12 +95,12 @@
#define OPTION_SIP_SERVER_A 22
#define OPTION_DNS_SERVERS 23
#define OPTION_DOMAIN_LIST 24
+#define OPTION_IA_PD 25
+#define OPTION_IAPREFIX 26
/*
- * The followings are also unassigned numbers.
+ * The followings are unassigned numbers.
*/
-#define OPTION_IA_PD 33
-#define OPTION_IAPREFIX 34
#define OPTION_NIS_SERVERS 35
#define OPTION_NISP_SERVERS 36
#define OPTION_NIS_DOMAIN_NAME 37
@@ -126,7 +126,7 @@
{ RECONFIGURE, "Reconfigure" },
{ INFORMATION_REQUEST, "Information-request" },
{ RELAY_FORW, "Relay-forw" },
- { RELAY_REPL, "Relay-repl" },
+ { RELAY_REPLY, "Relay-reply" },
{ 0, NULL }
};
@@ -679,7 +679,7 @@
bp_tree = proto_item_add_subtree(ti, ett_dhcpv6);
}
- while (msgtype == RELAY_FORW || msgtype == RELAY_REPL) {
+ while (msgtype == RELAY_FORW || msgtype == RELAY_REPLY) {
if (check_col(pinfo->cinfo, COL_INFO)) {
col_set_str(pinfo->cinfo, COL_INFO,
Index: packet-gre.c
===================================================================
RCS file: /cvsroot/ethereal/packet-gre.c,v
retrieving revision 1.54
diff -u -u -r1.54 packet-gre.c
--- packet-gre.c 10 Jun 2003 05:38:52 -0000 1.54
+++ packet-gre.c 29 Jan 2004 01:16:30 -0000
@@ -77,6 +77,7 @@
{ ETHERTYPE_IPX, "IPX"},
{ ETHERTYPE_ETHBRIDGE, "Transparent Ethernet bridging" },
{ GRE_FR, "Frame Relay"},
+ { ETHERTYPE_IPv6, "IPv6" },
{ 0, NULL }
};
