diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-08-28 17:31:12 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-08-28 17:31:12 +0000 |
| commit | 519a7778aaab6759ae073778fa93877efab49752 (patch) | |
| tree | a8e0f2e4ed1732aee629f5b5d51e242c484bf668 | |
| parent | 5c6670134cf66b9e86024e7a225503b2277ceb23 (diff) | |
Fix copy/paste error introduced in r51541 and spotted by Joerg
svn path=/trunk/; revision=51564
| -rw-r--r-- | config.nmake | 10 | ||||
| -rw-r--r-- | epan/dissectors/packet-gtp.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/config.nmake b/config.nmake index 95d00105f3..8810d3bce4 100644 --- a/config.nmake +++ b/config.nmake @@ -50,7 +50,7 @@ WTAP_VERSION_MICRO=0 # This can be defined in the system environment. # !IFNDEF WIRESHARK_LIB_DIR -WIRESHARK_LIB_DIR=C:\$(PROGRAM_NAME)-$(WIRESHARK_TARGET_PLATFORM)-libs +WIRESHARK_LIB_DIR=D:\dev\wireshark-$(WIRESHARK_TARGET_PLATFORM)-libs !ENDIF # @@ -119,7 +119,7 @@ PROCESSOR_ARCHITECTURE=amd64 # "Microsoft Visual C++ 2010 Express Edition" # Visual C++ 10.0, _MSC_VER 1600, msvcr100.dll -#MSVC_VARIANT=MSVC2010EE +MSVC_VARIANT=MSVC2010EE # "Microsoft Visual C++ 2012 Express Edition" # Visual C++ 11.0, _MSC_VER 1700, msvcr110.dll @@ -232,7 +232,7 @@ PCAP_NG_DEFAULT=^#define PCAP_NG_DEFAULT 1 ##### To Use packet editor uncomment this line #### ### Warning Experimental - work in progress -#WANT_PACKET_EDITOR=^#define WANT_PACKET_EDITOR 1 +WANT_PACKET_EDITOR=^#define WANT_PACKET_EDITOR 1 !if "$(WIRESHARK_TARGET_PLATFORM)" == "win32" ##### Win32 Libraries ##### @@ -252,7 +252,7 @@ GLIB_VERSION=2.0 # directory in which the "include" and "lib" directories reside. # # Set the name to gtk2 if you want to use gtk2 -GTK_NAME=gtk3 +GTK_NAME=gtk2 GTK_DIR=$(WIRESHARK_LIB_DIR)\$(GTK_NAME) @@ -695,7 +695,7 @@ GTK_SCHEMAS_DIR=\share\glib-2.0\schemas # The easiest way is to use the corresponding packages from cygwin. # Set up the path to the cygwin binaries -CYGWIN_PATH=c:\cygwin\bin +CYGWIN_PATH=d:\cygwin\bin # command for a shell (cygwin's bash package recommended) SH_PROG=bash diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index dcfa683be0..69f094a20e 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -4072,8 +4072,8 @@ decode_gtp_mm_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * 3GPP TS 24.008 10.5.5.6 ( see packet-gsm_a.c ) */ tf = proto_tree_add_text(ext_tree_mm, tvb, offset, 2, "DRX Parameter"); - /* tf_tree = proto_item_add_subtree(tf, ett_gtp_drx); */ - de_gmm_drx_param(tvb, ext_tree_mm, pinfo, offset, 2, NULL, 0); + tf_tree = proto_item_add_subtree(tf, ett_gtp_drx); + de_gmm_drx_param(tvb, tf_tree, pinfo, offset, 2, NULL, 0); offset = offset + 2; len = tvb_get_guint8(tvb, offset); |