forked from osmocom/wireshark
Dietmar Petras provided:
* fix a bug in packet-tftp.c dissecting TFTP Option Acknowledgement packets. The is no Block-Id in TFTP Option Acknowledgements, as it is in TFTP Acknowledgements. * Extension of manuf by ethernet addresses from ELSA (my company), a german vendor of ISDN routers, cable modems, etc. * New dissector for Time Protocol [RFC 0868]. That protocol works on port 37 of UDP and TCP. The implementation in this patch only dissects the more usual UDP version. It could print the time in a more fashion way, but thats for a later version. svn path=/trunk/; revision=1609
This commit is contained in:
Gilbert Ramirez
parent
41f0a2c5e6
commit
c08f671988
4
AUTHORS
4
AUTHORS
|
|
@ -243,6 +243,10 @@ Ed Meaney <emeaney@altiga.com> {
|
|||
Win32 support
|
||||
}
|
||||
|
||||
Dietmar Petras <DPetras@ELSA.de> {
|
||||
Time protocol support
|
||||
}
|
||||
|
||||
Alain Magloire <alainm@rcsm.ece.mcgill.ca> was kind enough to
|
||||
give his permission to use his version of snprintf.c.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Makefile.am
|
||||
# Automake file for Ethereal
|
||||
#
|
||||
# $Id: Makefile.am,v 1.162 2000/02/05 09:19:05 guy Exp $
|
||||
# $Id: Makefile.am,v 1.163 2000/02/09 17:15:46 gram Exp $
|
||||
#
|
||||
# Ethereal - Network traffic analyzer
|
||||
# By Gerald Combs <gerald@zing.org>
|
||||
|
|
@ -151,6 +151,7 @@ DISSECTOR_SOURCES = \
|
|||
packet-tcp.c \
|
||||
packet-telnet.c\
|
||||
packet-tftp.c \
|
||||
packet-time.c \
|
||||
packet-tns.c \
|
||||
packet-tns.h \
|
||||
packet-tr.c \
|
||||
|
|
|
|||
|
|
@ -102,6 +102,7 @@ DISSECTOR_OBJECTS = \
|
|||
packet-tcp.obj \
|
||||
packet-telnet.obj\
|
||||
packet-tftp.obj \
|
||||
packet-time.obj \
|
||||
packet-tns.obj \
|
||||
packet-tr.obj \
|
||||
packet-trmac.obj \
|
||||
|
|
|
|||
|
|
@ -820,6 +820,7 @@ B<http://ethereal.zing.org>.
|
|||
Gerrit Gehnen <G.Gehnen@atrie.de>
|
||||
Craig Newell <craign@cheque.uq.edu.au>
|
||||
Ed Meaney <emeaney@altiga.com>
|
||||
Dietmar Petras <DPetras@ELSA.de>
|
||||
|
||||
Alain Magloire <alainm@rcsm.ece.mcgill.ca> was kind enough to give his
|
||||
permission to use his version of snprintf.c.
|
||||
|
|
|
|||
3
manuf
3
manuf
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# /etc/manuf - Ethernet vendor codes
|
||||
#
|
||||
# $Id: manuf,v 1.5 2000/01/04 23:42:17 gram Exp $
|
||||
# $Id: manuf,v 1.6 2000/02/09 17:15:47 gram Exp $
|
||||
#
|
||||
# Laurent Deniel <deniel@worldnet.fr>
|
||||
#
|
||||
|
|
@ -140,6 +140,7 @@
|
|||
00:90:27 Intel
|
||||
00:90:b1 Cisco
|
||||
00:a0:24 3Com
|
||||
00:a0:57 ELSA
|
||||
00:aa:00 Intel
|
||||
00:c0:4f Dell
|
||||
00:c0:95 Znyx # Network Appliance
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
* Craig Newell <CraigN@cheque.uq.edu.au>
|
||||
* RFC2347 TFTP Option Extension
|
||||
*
|
||||
* $Id: packet-tftp.c,v 1.9 2000/01/27 07:09:15 guy Exp $
|
||||
* $Id: packet-tftp.c,v 1.10 2000/02/09 17:15:47 gram Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
|
@ -167,9 +167,6 @@ dissect_tftp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
|
|||
case OACK:
|
||||
proto_tree_add_text(tftp_tree, offset, 2, "Option Acknowledgement");
|
||||
offset += 2;
|
||||
i1 = pntohs(pd+offset);
|
||||
proto_tree_add_text(tftp_tree, offset, 2, "Block = %u", i1);
|
||||
offset += 2;
|
||||
while (offset < pi.captured_len) {
|
||||
int i2;
|
||||
i1 = strlen(pd+offset); /* length of option */
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-udp.c
|
||||
* Routines for UDP packet disassembly
|
||||
*
|
||||
* $Id: packet-udp.c,v 1.47 2000/02/01 04:13:47 guy Exp $
|
||||
* $Id: packet-udp.c,v 1.48 2000/02/09 17:15:47 gram Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
|
@ -66,6 +66,7 @@ typedef struct _e_udphdr {
|
|||
|
||||
/* UDP Ports -> should go in packet-udp.h */
|
||||
|
||||
#define UDP_PORT_TIME 37
|
||||
#define UDP_PORT_TACACS 49
|
||||
#define UDP_PORT_DNS 53
|
||||
#define UDP_PORT_BOOTPS 67
|
||||
|
|
@ -303,6 +304,9 @@ dissect_udp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
|
|||
/* This is the first point of call, but it adds a dynamic call */
|
||||
udp_hash_add(MAX(uh_sport, uh_dport), dissect_tftp); /* Add to table */
|
||||
dissect_tftp(pd, offset, fd, tree);
|
||||
} else if (PORT_IS(UDP_PORT_TIME)) {
|
||||
/* This is the first point of call, but it adds a dynamic call */
|
||||
dissect_time(pd, offset, fd, tree);
|
||||
} else if (PORT_IS(UDP_PORT_RADIUS) ||
|
||||
PORT_IS(UDP_PORT_RADACCT) ||
|
||||
PORT_IS(UDP_PORT_RADIUS_NEW) ||
|
||||
|
|
|
|||
3
packet.h
3
packet.h
|
|
@ -1,7 +1,7 @@
|
|||
/* packet.h
|
||||
* Definitions for packet disassembly structures and routines
|
||||
*
|
||||
* $Id: packet.h,v 1.170 2000/02/05 09:19:06 guy Exp $
|
||||
* $Id: packet.h,v 1.171 2000/02/09 17:15:47 gram Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
|
@ -402,6 +402,7 @@ void dissect_tacplus(const u_char *, int, frame_data *, proto_tree *);
|
|||
void dissect_tcp(const u_char *, int, frame_data *, proto_tree *);
|
||||
void dissect_telnet(const u_char *, int, frame_data *, proto_tree *);
|
||||
void dissect_tftp(const u_char *, int, frame_data *, proto_tree *);
|
||||
void dissect_time(const u_char *, int, frame_data *, proto_tree *);
|
||||
void dissect_tns(const u_char *, int, frame_data *, proto_tree *);
|
||||
void dissect_tr(const u_char *, int, frame_data *, proto_tree *);
|
||||
void dissect_trmac(const u_char *, int, frame_data *, proto_tree *);
|
||||
|
|
|
|||
Loading…
Reference in New Issue