diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2003-08-01 09:16:47 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2003-08-01 09:16:47 +0000 |
| commit | 618fff963a2870c905ce6681903d1fcbc1f06d34 (patch) | |
| tree | 691423da9e5986f06e3daed717d3893f24c15d05 | |
| parent | 90bf936ffa01bb1c8fbb0351f896cbf9c4f81dd2 (diff) | |
Fix bug on how the H.225 CS routines were registered so that H225 CS over Q931 now works
Still something wrong with NonStandardParameter, I cant find why ethereal is
wrong but it misses misses one bit in the decoding causing malformed frames.
I cant see what is wrong when looking at the packets. need furhter investigations.
Make h225 compile in as default
svn path=/trunk/; revision=8119
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | Makefile.nmake | 3 | ||||
| -rw-r--r-- | packet-h225.c | 12 |
3 files changed, 8 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 423b4b7f4d..e758d02a6c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Ethereal # -# $Id: Makefile.am,v 1.603 2003/07/24 20:22:50 guy Exp $ +# $Id: Makefile.am,v 1.604 2003/08/01 09:16:47 sahlberg Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@ethereal.com> @@ -216,6 +216,7 @@ DISSECTOR_SRC = \ packet-gtp.c \ packet-gvrp.c \ packet-h1.c \ + packet-h225.c \ packet-h245.c \ packet-h261.c \ packet-hclnfsd.c \ diff --git a/Makefile.nmake b/Makefile.nmake index 082569897c..858694eb7e 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1,7 +1,7 @@ ## Makefile for building ethereal.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake,v 1.320 2003/07/24 20:22:50 guy Exp $ +# $Id: Makefile.nmake,v 1.321 2003/08/01 09:16:47 sahlberg Exp $ include config.nmake include <win32.mak> @@ -157,6 +157,7 @@ DISSECTOR_SRC = \ packet-gtp.c \ packet-gvrp.c \ packet-h1.c \ + packet-h225.c \ packet-h245.c \ packet-h261.c \ packet-hclnfsd.c \ diff --git a/packet-h225.c b/packet-h225.c index 8507642bac..5c6d5eaa64 100644 --- a/packet-h225.c +++ b/packet-h225.c @@ -1,10 +1,8 @@ -/*this is very incomplete, please report problems, bugs, suggestions for - cosmetic enhancements etc */ /* packet-h225.c * Routines for H.225 packet dissection * 2003 Ronnie Sahlberg * - * $Id: packet-h225.c,v 1.1 2003/07/31 10:35:07 sahlberg Exp $ + * $Id: packet-h225.c,v 1.2 2003/08/01 09:16:46 sahlberg Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -6835,7 +6833,7 @@ static per_choice_t h323_message_body_choice[] = { dissect_h225_InformationUUIE }, { 5, "releaseComplete", EXTENSION_ROOT, dissect_h225_ReleaseCompleteUUIE }, - { 6, "facility", NOT_EXTENSION_ROOT, + { 6, "facility", EXTENSION_ROOT, dissect_h225_FacilityUUIE }, { 7, "progress", NOT_EXTENSION_ROOT, dissect_h225_ProgressUUIE }, @@ -8105,7 +8103,7 @@ dissect_h225_RasMessage(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) static per_sequence_t H323_UserInformation_sequence[] = { { "h323_uu_pdu", EXTENSION_ROOT, NOT_OPTIONAL, dissect_h225_H323_UU_PDU }, - { "user_data", EXTENSION_ROOT, NOT_OPTIONAL, + { "user_data", EXTENSION_ROOT, OPTIONAL, dissect_h225_user_data }, { NULL, 0, 0, NULL } }; @@ -9789,6 +9787,7 @@ proto_register_h225(void) "Reassemble H.225 over TCP", "Whether the dissector should reassemble H.225 PDUs spanning multiple TCP segments", &h225_reassembly); + register_dissector("h225", dissect_h225_H323UserInformation, proto_h225); } void @@ -9798,9 +9797,6 @@ proto_reg_handoff_h225(void) H323UserInformation_handle=create_dissector_handle(dissect_h225_H323UserInformation, proto_h225); - dissector_add("tcp.port", TCP_PORT_CS, H323UserInformation_handle); - dissector_add("udp.port", UDP_PORT_RAS1, h225ras_handle); dissector_add("udp.port", UDP_PORT_RAS2, h225ras_handle); - } |