forked from osmocom/wireshark
The NetInfo parent server address is an IPv4 address, and the NetInfo
parent server tag is a string. Also, it's "NetInfo", not "Netinfo". Clean up white space. svn path=/trunk/; revision=8088
This commit is contained in:
parent
1eb4be4dc2
commit
e43046bfb0
214
packet-bootp.c
214
packet-bootp.c
|
@ -2,7 +2,7 @@
|
|||
* Routines for BOOTP/DHCP packet disassembly
|
||||
* Gilbert Ramirez <gram@alumni.rice.edu>
|
||||
*
|
||||
* $Id: packet-bootp.c,v 1.73 2003/02/13 08:29:19 guy Exp $
|
||||
* $Id: packet-bootp.c,v 1.74 2003/07/29 00:35:55 guy Exp $
|
||||
*
|
||||
* The information used comes from:
|
||||
* RFC 951: Bootstrap Protocol
|
||||
|
@ -196,87 +196,87 @@ bootp_option(tvbuff_t *tvb, proto_tree *bp_tree, int voff, int eoff,
|
|||
{ 0, NULL } };
|
||||
|
||||
static struct opt_info opt[] = {
|
||||
/* 0 */ { "Padding", none },
|
||||
/* 1 */ { "Subnet Mask", ipv4 },
|
||||
/* 2 */ { "Time Offset", val_s_long },
|
||||
/* 3 */ { "Router", ipv4 },
|
||||
/* 4 */ { "Time Server", ipv4 },
|
||||
/* 5 */ { "Name Server", ipv4 },
|
||||
/* 6 */ { "Domain Name Server", ipv4 },
|
||||
/* 7 */ { "Log Server", ipv4 },
|
||||
/* 8 */ { "Cookie Server", ipv4 },
|
||||
/* 9 */ { "LPR Server", ipv4 },
|
||||
/* 10 */ { "Impress Server", ipv4 },
|
||||
/* 11 */ { "Resource Location Server", ipv4 },
|
||||
/* 12 */ { "Host Name", string },
|
||||
/* 13 */ { "Boot File Size", val_u_short },
|
||||
/* 14 */ { "Merit Dump File", string },
|
||||
/* 15 */ { "Domain Name", string },
|
||||
/* 16 */ { "Swap Server", ipv4 },
|
||||
/* 17 */ { "Root Path", string },
|
||||
/* 18 */ { "Extensions Path", string },
|
||||
/* 19 */ { "IP Forwarding", toggle },
|
||||
/* 20 */ { "Non-Local Source Routing", toggle },
|
||||
/* 21 */ { "Policy Filter", special },
|
||||
/* 0 */ { "Padding", none },
|
||||
/* 1 */ { "Subnet Mask", ipv4 },
|
||||
/* 2 */ { "Time Offset", val_s_long },
|
||||
/* 3 */ { "Router", ipv4 },
|
||||
/* 4 */ { "Time Server", ipv4 },
|
||||
/* 5 */ { "Name Server", ipv4 },
|
||||
/* 6 */ { "Domain Name Server", ipv4 },
|
||||
/* 7 */ { "Log Server", ipv4 },
|
||||
/* 8 */ { "Cookie Server", ipv4 },
|
||||
/* 9 */ { "LPR Server", ipv4 },
|
||||
/* 10 */ { "Impress Server", ipv4 },
|
||||
/* 11 */ { "Resource Location Server", ipv4 },
|
||||
/* 12 */ { "Host Name", string },
|
||||
/* 13 */ { "Boot File Size", val_u_short },
|
||||
/* 14 */ { "Merit Dump File", string },
|
||||
/* 15 */ { "Domain Name", string },
|
||||
/* 16 */ { "Swap Server", ipv4 },
|
||||
/* 17 */ { "Root Path", string },
|
||||
/* 18 */ { "Extensions Path", string },
|
||||
/* 19 */ { "IP Forwarding", toggle },
|
||||
/* 20 */ { "Non-Local Source Routing", toggle },
|
||||
/* 21 */ { "Policy Filter", special },
|
||||
/* 22 */ { "Maximum Datagram Reassembly Size", val_u_short },
|
||||
/* 23 */ { "Default IP Time-to-Live", val_u_byte },
|
||||
/* 24 */ { "Path MTU Aging Timeout", time_in_secs },
|
||||
/* 25 */ { "Path MTU Plateau Table", val_u_short },
|
||||
/* 26 */ { "Interface MTU", val_u_short },
|
||||
/* 27 */ { "All Subnets are Local", yes_no },
|
||||
/* 28 */ { "Broadcast Address", ipv4 },
|
||||
/* 29 */ { "Perform Mask Discovery", toggle },
|
||||
/* 30 */ { "Mask Supplier", yes_no },
|
||||
/* 31 */ { "Perform Router Discover", toggle },
|
||||
/* 32 */ { "Router Solicitation Address", ipv4 },
|
||||
/* 33 */ { "Static Route", special },
|
||||
/* 34 */ { "Trailer Encapsulation", toggle },
|
||||
/* 35 */ { "ARP Cache Timeout", time_in_secs },
|
||||
/* 36 */ { "Ethernet Encapsulation", toggle },
|
||||
/* 37 */ { "TCP Default TTL", val_u_byte },
|
||||
/* 38 */ { "TCP Keepalive Interval", time_in_secs },
|
||||
/* 39 */ { "TCP Keepalive Garbage", toggle },
|
||||
/* 23 */ { "Default IP Time-to-Live", val_u_byte },
|
||||
/* 24 */ { "Path MTU Aging Timeout", time_in_secs },
|
||||
/* 25 */ { "Path MTU Plateau Table", val_u_short },
|
||||
/* 26 */ { "Interface MTU", val_u_short },
|
||||
/* 27 */ { "All Subnets are Local", yes_no },
|
||||
/* 28 */ { "Broadcast Address", ipv4 },
|
||||
/* 29 */ { "Perform Mask Discovery", toggle },
|
||||
/* 30 */ { "Mask Supplier", yes_no },
|
||||
/* 31 */ { "Perform Router Discover", toggle },
|
||||
/* 32 */ { "Router Solicitation Address", ipv4 },
|
||||
/* 33 */ { "Static Route", special },
|
||||
/* 34 */ { "Trailer Encapsulation", toggle },
|
||||
/* 35 */ { "ARP Cache Timeout", time_in_secs },
|
||||
/* 36 */ { "Ethernet Encapsulation", toggle },
|
||||
/* 37 */ { "TCP Default TTL", val_u_byte },
|
||||
/* 38 */ { "TCP Keepalive Interval", time_in_secs },
|
||||
/* 39 */ { "TCP Keepalive Garbage", toggle },
|
||||
/* 40 */ { "Network Information Service Domain", string },
|
||||
/* 41 */ { "Network Information Service Servers", ipv4 },
|
||||
/* 42 */ { "Network Time Protocol Servers", ipv4 },
|
||||
/* 43 */ { "Vendor-Specific Information", special },
|
||||
/* 43 */ { "Vendor-Specific Information", special },
|
||||
/* 44 */ { "NetBIOS over TCP/IP Name Server", ipv4 },
|
||||
/* 45 */ { "NetBIOS over TCP/IP Datagram Distribution Name Server", ipv4 },
|
||||
/* 46 */ { "NetBIOS over TCP/IP Node Type", special },
|
||||
/* 47 */ { "NetBIOS over TCP/IP Scope", string },
|
||||
/* 48 */ { "X Window System Font Server", ipv4 },
|
||||
/* 47 */ { "NetBIOS over TCP/IP Scope", string },
|
||||
/* 48 */ { "X Window System Font Server", ipv4 },
|
||||
/* 49 */ { "X Window System Display Manager", ipv4 },
|
||||
/* 50 */ { "Requested IP Address", ipv4 },
|
||||
/* 51 */ { "IP Address Lease Time", time_in_secs },
|
||||
/* 52 */ { "Option Overload", special },
|
||||
/* 53 */ { "DHCP Message Type", special },
|
||||
/* 54 */ { "Server Identifier", ipv4 },
|
||||
/* 55 */ { "Parameter Request List", special },
|
||||
/* 56 */ { "Message", string },
|
||||
/* 57 */ { "Maximum DHCP Message Size", val_u_short },
|
||||
/* 58 */ { "Renewal Time Value", time_in_secs },
|
||||
/* 59 */ { "Rebinding Time Value", time_in_secs },
|
||||
/* 60 */ { "Vendor class identifier", special },
|
||||
/* 61 */ { "Client identifier", special },
|
||||
/* 62 */ { "Novell/Netware IP domain", string },
|
||||
/* 63 */ { "Novell Options", special },
|
||||
/* 50 */ { "Requested IP Address", ipv4 },
|
||||
/* 51 */ { "IP Address Lease Time", time_in_secs },
|
||||
/* 52 */ { "Option Overload", special },
|
||||
/* 53 */ { "DHCP Message Type", special },
|
||||
/* 54 */ { "Server Identifier", ipv4 },
|
||||
/* 55 */ { "Parameter Request List", special },
|
||||
/* 56 */ { "Message", string },
|
||||
/* 57 */ { "Maximum DHCP Message Size", val_u_short },
|
||||
/* 58 */ { "Renewal Time Value", time_in_secs },
|
||||
/* 59 */ { "Rebinding Time Value", time_in_secs },
|
||||
/* 60 */ { "Vendor class identifier", special },
|
||||
/* 61 */ { "Client identifier", special },
|
||||
/* 62 */ { "Novell/Netware IP domain", string },
|
||||
/* 63 */ { "Novell Options", special },
|
||||
/* 64 */ { "Network Information Service+ Domain", string },
|
||||
/* 65 */ { "Network Information Service+ Servers", ipv4 },
|
||||
/* 66 */ { "TFTP Server Name", string },
|
||||
/* 67 */ { "Bootfile name", string },
|
||||
/* 68 */ { "Mobile IP Home Agent", ipv4 },
|
||||
/* 69 */ { "SMTP Server", ipv4 },
|
||||
/* 70 */ { "POP3 Server", ipv4 },
|
||||
/* 71 */ { "NNTP Server", ipv4 },
|
||||
/* 72 */ { "Default WWW Server", ipv4 },
|
||||
/* 73 */ { "Default Finger Server", ipv4 },
|
||||
/* 74 */ { "Default IRC Server", ipv4 },
|
||||
/* 75 */ { "StreetTalk Server", ipv4 },
|
||||
/* 76 */ { "StreetTalk Directory Assistance Server", ipv4 },
|
||||
/* 77 */ { "User Class Information", opaque },
|
||||
/* 78 */ { "Directory Agent Information", opaque },
|
||||
/* 79 */ { "Service Location Agent Scope", opaque },
|
||||
/* 80 */ { "Naming Authority", opaque },
|
||||
/* 66 */ { "TFTP Server Name", string },
|
||||
/* 67 */ { "Bootfile name", string },
|
||||
/* 68 */ { "Mobile IP Home Agent", ipv4 },
|
||||
/* 69 */ { "SMTP Server", ipv4 },
|
||||
/* 70 */ { "POP3 Server", ipv4 },
|
||||
/* 71 */ { "NNTP Server", ipv4 },
|
||||
/* 72 */ { "Default WWW Server", ipv4 },
|
||||
/* 73 */ { "Default Finger Server", ipv4 },
|
||||
/* 74 */ { "Default IRC Server", ipv4 },
|
||||
/* 75 */ { "StreetTalk Server", ipv4 },
|
||||
/* 76 */ { "StreetTalk Directory Assistance Server", ipv4 },
|
||||
/* 77 */ { "User Class Information", opaque },
|
||||
/* 78 */ { "Directory Agent Information", opaque },
|
||||
/* 79 */ { "Service Location Agent Scope", opaque },
|
||||
/* 80 */ { "Naming Authority", opaque },
|
||||
/* 81 */ { "Client Fully Qualified Domain Name", opaque },
|
||||
/* 82 */ { "Agent Information Option", special },
|
||||
/* 83 */ { "Unassigned", opaque },
|
||||
|
@ -284,46 +284,46 @@ bootp_option(tvbuff_t *tvb, proto_tree *bp_tree, int voff, int eoff,
|
|||
/* 85 */ { "Novell Directory Services Servers", opaque },
|
||||
/* 86 */ { "Novell Directory Services Tree Name", opaque },
|
||||
/* 87 */ { "Novell Directory Services Context", opaque },
|
||||
/* 88 */ { "IEEE 1003.1 POSIX Timezone", opaque },
|
||||
/* 89 */ { "Fully Qualified Domain Name", opaque },
|
||||
/* 88 */ { "IEEE 1003.1 POSIX Timezone", opaque },
|
||||
/* 89 */ { "Fully Qualified Domain Name", opaque },
|
||||
/* 90 */ { "Authentication", special },
|
||||
/* 91 */ { "Vines TCP/IP Server Option", opaque },
|
||||
/* 92 */ { "Server Selection Option", opaque },
|
||||
/* 93 */ { "Client System Architecture", opaque },
|
||||
/* 91 */ { "Vines TCP/IP Server Option", opaque },
|
||||
/* 92 */ { "Server Selection Option", opaque },
|
||||
/* 93 */ { "Client System Architecture", opaque },
|
||||
/* 94 */ { "Client Network Device Interface", opaque },
|
||||
/* 95 */ { "Lightweight Directory Access Protocol", opaque },
|
||||
/* 96 */ { "IPv6 Transitions", opaque },
|
||||
/* 96 */ { "IPv6 Transitions", opaque },
|
||||
/* 97 */ { "UUID/GUID-based Client Identifier", opaque },
|
||||
/* 98 */ { "Open Group's User Authentication", opaque },
|
||||
/* 99 */ { "Unassigned", opaque },
|
||||
/* 100 */ { "Printer Name", opaque },
|
||||
/* 101 */ { "MDHCP multicast address", opaque },
|
||||
/* 102 */ { "Removed/unassigned", opaque },
|
||||
/* 103 */ { "Removed/unassigned", opaque },
|
||||
/* 104 */ { "Removed/unassigned", opaque },
|
||||
/* 105 */ { "Removed/unassigned", opaque },
|
||||
/* 106 */ { "Removed/unassigned", opaque },
|
||||
/* 107 */ { "Removed/unassigned", opaque },
|
||||
/* 108 */ { "Swap Path Option", opaque },
|
||||
/* 109 */ { "Unassigned", opaque },
|
||||
/* 110 */ { "IPX Compability", opaque },
|
||||
/* 111 */ { "Unassigned", opaque },
|
||||
/* 112 */ { "Netinfo Parent Server Address", opaque },
|
||||
/* 113 */ { "Netinfo Parent Server Tag", opaque },
|
||||
/* 114 */ { "URL", opaque },
|
||||
/* 115 */ { "DHCP Failover Protocol", opaque },
|
||||
/* 116 */ { "DHCP Auto-Configuration", opaque },
|
||||
/* 117 */ { "Unassigned", opaque },
|
||||
/* 118 */ { "Unassigned", opaque },
|
||||
/* 119 */ { "Unassigned", opaque },
|
||||
/* 120 */ { "Unassigned", opaque },
|
||||
/* 121 */ { "Unassigned", opaque },
|
||||
/* 122 */ { "Unassigned", opaque },
|
||||
/* 123 */ { "Unassigned", opaque },
|
||||
/* 124 */ { "Unassigned", opaque },
|
||||
/* 125 */ { "Unassigned", opaque },
|
||||
/* 126 */ { "Extension", opaque },
|
||||
/* 127 */ { "Extension", opaque },
|
||||
/* 99 */ { "Unassigned", opaque },
|
||||
/* 100 */ { "Printer Name", opaque },
|
||||
/* 101 */ { "MDHCP multicast address", opaque },
|
||||
/* 102 */ { "Removed/unassigned", opaque },
|
||||
/* 103 */ { "Removed/unassigned", opaque },
|
||||
/* 104 */ { "Removed/unassigned", opaque },
|
||||
/* 105 */ { "Removed/unassigned", opaque },
|
||||
/* 106 */ { "Removed/unassigned", opaque },
|
||||
/* 107 */ { "Removed/unassigned", opaque },
|
||||
/* 108 */ { "Swap Path Option", opaque },
|
||||
/* 109 */ { "Unassigned", opaque },
|
||||
/* 110 */ { "IPX Compability", opaque },
|
||||
/* 111 */ { "Unassigned", opaque },
|
||||
/* 112 */ { "NetInfo Parent Server Address", ipv4 },
|
||||
/* 113 */ { "NetInfo Parent Server Tag", string },
|
||||
/* 114 */ { "URL", opaque },
|
||||
/* 115 */ { "DHCP Failover Protocol", opaque },
|
||||
/* 116 */ { "DHCP Auto-Configuration", opaque },
|
||||
/* 117 */ { "Unassigned", opaque },
|
||||
/* 118 */ { "Unassigned", opaque },
|
||||
/* 119 */ { "Unassigned", opaque },
|
||||
/* 120 */ { "Unassigned", opaque },
|
||||
/* 121 */ { "Unassigned", opaque },
|
||||
/* 122 */ { "Unassigned", opaque },
|
||||
/* 123 */ { "Unassigned", opaque },
|
||||
/* 124 */ { "Unassigned", opaque },
|
||||
/* 125 */ { "Unassigned", opaque },
|
||||
/* 126 */ { "Extension", opaque },
|
||||
/* 127 */ { "Extension", opaque },
|
||||
/* 128 */ { "Private", opaque },
|
||||
/* 129 */ { "Private", opaque },
|
||||
/* 130 */ { "Private", opaque },
|
||||
|
|
Loading…
Reference in New Issue