Commit 13d2a0df authored by Raphaël Hertzog's avatar Raphaël Hertzog

Merge tag 'upstream/1.8.5'

Upstream version 1.8.5

Conflicts:
	configure

Reinstate config.guess, config.sub and config.h.in too.
parents 9696c810 4d0965a6
This diff is collapsed.
# Makefile.am
# Automake file for Wireshark
#
# $Id: Makefile.am 43562 2012-07-03 20:20:37Z guy $
# $Id: Makefile.am 46270 2012-11-28 23:10:31Z gerald $
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
......@@ -19,7 +19,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
ACLOCAL_AMFLAGS = `./aclocal-flags`
......@@ -81,7 +81,8 @@ diameter_DATA = \
diameter/TGPPRx.xml \
diameter/TGPPS9.xml \
diameter/TGPPSh.xml \
diameter/Vodafone.xml
diameter/Vodafone.xml \
diameter/AlcatelLucent.xml
#
# Install the DTDs directory files in the "dtds" subdirectory
......@@ -324,6 +325,9 @@ endif
# It is not actually a superset: gmodule is included in GLIB_LIBS but
# not in GTK_LIBS (unless accidentally on older glibs/gtks)."
#
# although it's also possible that -lgmodule is in GTK_LIBS but not
# GLIB_LIBS (that's the case on my machine right now, for example).
#
wireshark_LDADD = \
ui/gtk/libgtkui.a \
ui/gtk/libgtkui_dirty.a \
......@@ -909,6 +913,27 @@ help/faq.txt: $(srcdir)/help/faq.py
libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status --recheck
# Used by patch-bzip2
# Trim off any extra version information and find the previous micro release.
BASE_VERSION=`echo "$(VERSION)" | awk -F. '{$$3 = $$3 + 0 ; printf("%d.%d.%d"), $$1, $$2, $$3}'`
PREV_VERSION=`echo "$(VERSION)" | awk -F. '{$$3 = $$3 + 0 ; if ($$3 > 0) $$3-- ; printf("%d.%d.%d"), $$1, $$2, $$3}'`
PREV_DIR="wireshark-$(PREV_VERSION)"
PREV_FILE="$(PREV_DIR).tar.bz2"
PREV_URL="http://www.wireshark.org/download/src/all-versions/$(PREV_FILE)"
patch-bzip2: distdir
if test x$(BASE_VERSION) != x$(PREV_VERSION) ; then \
curl -z $(PREV_FILE) -o $(PREV_FILE) $(PREV_URL) && \
tar -xjf $(PREV_FILE) && \
diff -urN $(PREV_DIR) $(distdir) | bzip2 > patch-wireshark-$(PREV_VERSION)-to-$(VERSION).diff.bz2 && \
echo "Created patch-bzip2" ; \
rm -rf "$(PREV_FILE)" "$(PREV_DIR)" ; \
else \
echo "This appears to be the first micro version ($(PREV_VERSION)). Skipping." ; \
fi
$(am__remove_distdir)
# Used by svr4-package and osx-package
# We load top_stagedir with an explicit path so that libtool doesn't freak.
top_stagedir=`cd $(top_srcdir) && pwd`/packaging/staging
......
......@@ -17,7 +17,7 @@
# Makefile.am
# Automake file for Wireshark
#
# $Id: Makefile.am 43562 2012-07-03 20:20:37Z guy $
# $Id: Makefile.am 46270 2012-11-28 23:10:31Z gerald $
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
......@@ -35,7 +35,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Makefile.common
# Contains the stuff from Makefile.am and Makefile.nmake that is
......@@ -604,7 +604,8 @@ diameter_DATA = \
diameter/TGPPRx.xml \
diameter/TGPPS9.xml \
diameter/TGPPSh.xml \
diameter/Vodafone.xml
diameter/Vodafone.xml \
diameter/AlcatelLucent.xml
#
......@@ -1042,6 +1043,9 @@ noinst_HEADERS = \
# It is not actually a superset: gmodule is included in GLIB_LIBS but
# not in GTK_LIBS (unless accidentally on older glibs/gtks)."
#
# although it's also possible that -lgmodule is in GTK_LIBS but not
# GLIB_LIBS (that's the case on my machine right now, for example).
#
wireshark_LDADD = \
ui/gtk/libgtkui.a \
ui/gtk/libgtkui_dirty.a \
......@@ -1584,6 +1588,14 @@ DIST_SUBDIRS = asn1 codecs doc epan ui ui/cli ui/gtk ui/qt help packaging plugin
@HAVE_PLUGINS_FALSE@SUBDIRS = tools wsutil wiretap epan packaging help ui @wireshark_SUBDIRS@ ui/cli . doc
@HAVE_PLUGINS_TRUE@SUBDIRS = tools wsutil wiretap epan plugins packaging help ui @wireshark_SUBDIRS@ ui/cli . doc
# Used by patch-bzip2
# Trim off any extra version information and find the previous micro release.
BASE_VERSION = `echo "$(VERSION)" | awk -F. '{$$3 = $$3 + 0 ; printf("%d.%d.%d"), $$1, $$2, $$3}'`
PREV_VERSION = `echo "$(VERSION)" | awk -F. '{$$3 = $$3 + 0 ; if ($$3 > 0) $$3-- ; printf("%d.%d.%d"), $$1, $$2, $$3}'`
PREV_DIR = "wireshark-$(PREV_VERSION)"
PREV_FILE = "$(PREV_DIR).tar.bz2"
PREV_URL = "http://www.wireshark.org/download/src/all-versions/$(PREV_FILE)"
# Used by svr4-package and osx-package
# We load top_stagedir with an explicit path so that libtool doesn't freak.
top_stagedir = `cd $(top_srcdir) && pwd`/packaging/staging
......@@ -3681,6 +3693,18 @@ help/faq.txt: $(srcdir)/help/faq.py
libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status --recheck
patch-bzip2: distdir
if test x$(BASE_VERSION) != x$(PREV_VERSION) ; then \
curl -z $(PREV_FILE) -o $(PREV_FILE) $(PREV_URL) && \
tar -xjf $(PREV_FILE) && \
diff -urN $(PREV_DIR) $(distdir) | bzip2 > patch-wireshark-$(PREV_VERSION)-to-$(VERSION).diff.bz2 && \
echo "Created patch-bzip2" ; \
rm -rf "$(PREV_FILE)" "$(PREV_DIR)" ; \
else \
echo "This appears to be the first micro version ($(PREV_VERSION)). Skipping." ; \
fi
$(am__remove_distdir)
svr4-package: $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA)
@if test x$(HAVE_SVR4_PACKAGING) = xyes ; then \
rm -rf $(stagedir) ; \
......
## Makefile for building wireshark.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
# $Id: Makefile.nmake 44086 2012-07-27 23:30:58Z gerald $
# $Id: Makefile.nmake 46521 2012-12-12 16:41:37Z pascal $
# We "Deploy using XCopy," which is described at
# http://msdn.microsoft.com/en-us/library/ms235291.aspx
......@@ -903,7 +903,7 @@ process_libs:
!ENDIF
!IFDEF HHC_DIR
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
user-guide user-guide-37310.zip
user-guide user-guide-46517.zip
!ENDIF
!IFDEF UPX
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
......
Wireshark 1.8.2 Release Notes
Wireshark 1.8.5 Release Notes
------------------------------------------------------------------
......@@ -14,165 +14,151 @@ What's New
The following vulnerabilities have been fixed.
o wnpa-sec-2012-13
o wnpa-sec-2013-01
The DCP ETSI dissector could trigger a zero division. Reported
by Laurent Butti. (Bug 7566)
Infinite and large loops in the Bluetooth HCI, CSN.1, DCP-ETSI
DOCSIS CM-STAUS, IEEE 802.3 Slow Protocols, MPLS, R3, RTPS,
SDP, and SIP dissectors. Reported by Laurent Butti. (Bugs
8036, 8037, 8038, 8040, 8041, 8042, 8043, 8198, 8199, 8222)
Versions affected: 1.4.0 to 1.4.14, 1.6.0 to 1.6.9, 1.8.0 to
1.8.1.
Versions affected: 1.8.0 to 1.8.4, 1.6.0 to 1.6.12.
CVE-2012-4285
GENERIC-MAP-NOMATCH
o wnpa-sec-2012-14
o wnpa-sec-2013-02
The MongoDB dissector could go into a large loop. Reported by
Ben Schmidt. (Bug 7572)
The CLNP dissector could crash. Discovered independently by
Laurent Butti and the Wireshark development team. (Bug 7871)
Versions affected: 1.8.0 to 1.8.1.
Versions affected: 1.8.0 to 1.8.4, 1.6.0 to 1.6.12.
CVE-2012-4287
GENERIC-MAP-NOMATCH
o wnpa-sec-2012-15
o wnpa-sec-2013-03
The XTP dissector could go into an infinite loop. Reported by
Ben Schmidt. (Bug 7571)
The DTN dissector could crash. (Bug 7945)
Versions affected: 1.4.0 to 1.4.14, 1.6.0 to 1.6.9, 1.8.0 to
1.8.1.
Versions affected: 1.8.0 to 1.8.4, 1.6.0 to 1.6.12.
CVE-2012-4288
GENERIC-MAP-NOMATCH
o wnpa-sec-2012-16
o wnpa-sec-2013-04
The ERF dissector could overflow a buffer. Reported by Laurent
Butti. (Bug 7563)
The MS-MMC dissector (and possibly others) could crash. (Bug
8112)
Versions affected: 1.8.0 to 1.8.1.
Versions affected: 1.8.0 to 1.8.4, 1.6.0 to 1.6.12.
CVE-2012-4294 CVE-2012-4295
GENERIC-MAP-NOMATCH
o wnpa-sec-2012-17
o wnpa-sec-2013-05
The AFP dissector could go into a large loop. Reported by
Stefan Cornelius. (Bug 7603)
The DTLS dissector could crash. Discovered by Laurent Butti.
(Bug 8111)
Versions affected: 1.4.0 to 1.4.14, 1.6.0 to 1.6.9, 1.8.0 to
1.8.1.
Versions affected: 1.8.0 to 1.8.4, 1.6.0 to 1.6.12.
CVE-2012-4289
GENERIC-MAP-NOMATCH
o wnpa-sec-2012-18
o wnpa-sec-2013-06
The RTPS2 dissector could overflow a buffer. Reported by
Laurent Butti. (Bug 7568)
The ROHC dissector could crash. (Bug 7679)
Versions affected: 1.4.0 to 1.4.14, 1.6.0 to 1.6.9, 1.8.0 to
1.8.1.
Versions affected: 1.8.0 to 1.8.4, 1.6.0 to 1.6.12.
CVE-2012-4296
GENERIC-MAP-NOMATCH
o wnpa-sec-2012-19
o wnpa-sec-2013-07
The GSM RLC MAC dissector could overflow a buffer. Reported by
Laurent Butti. (Bug 7561)
The DCP-ETSI dissector could corrupt memory. Discovered by
Laurent Butti. (Bug 8213)
Versions affected: 1.6.0 to 1.6.9, 1.8.0 to 1.8.1.
Versions affected: 1.8.0 to 1.8.4, 1.6.0 to 1.6.12.
CVE-2012-4297
GENERIC-MAP-NOMATCH
o wnpa-sec-2012-20
o wnpa-sec-2013-08
The CIP dissector could exhaust system memory. Reported by Ben
Schmidt. (Bug 7570)
The Wireshark dissection engine could crash. Discovered by
Laurent Butti. (Bug 8197)
Versions affected: 1.4.0 to 1.4.14, 1.6.0 to 1.6.9, 1.8.0 to
1.8.1.
Versions affected: 1.8.0 to 1.8.4, 1.6.0 to 1.6.12.
CVE-2012-4291
GENERIC-MAP-NOMATCH
o wnpa-sec-2012-21
o wnpa-sec-2013-09
The STUN dissector could crash. Reported by Laurent Butti.
(Bug 7569)
The NTLMSSP dissector could overflow a buffer. Discovered by
Ulf Härnhammar. (Bug X)
Versions affected: 1.4.0 to 1.4.14, 1.6.0 to 1.6.9, 1.8.0 to
1.8.1.
Versions affected: 1.8.0 to 1.8.4, 1.6.0 to 1.6.12.
CVE-2012-4292
GENERIC-MAP-NOMATCH
o wnpa-sec-2012-22
The EtherCAT Mailbox dissector could abort. Reported by
Laurent Butti. (Bug 7562)
Versions affected: 1.4.0 to 1.4.14, 1.6.0 to 1.6.9, 1.8.0 to
1.8.1.
CVE-2012-4293
o wnpa-sec-2012-23
The CTDB dissector could go into a large loop. Reported by Ben
Schmidt. (Bug 7573)
The following bugs have been fixed:
Versions affected: 1.4.0 to 1.4.14, 1.6.0 to 1.6.9, 1.8.0 to
1.8.1.
o SNMPv3 Engine ID registration. (Bug 2426)
CVE-2012-4290
o Wrong decoding of gtp.target identification. (Bug 3974)
o wnpa-sec-2012-24
o Reassemble.c leaks memory for GLIB > 2.8. (Bug 4141)
The pcap-ng file parser could trigger a zero division. (Bug
7533)
o Wireshark crashes when starting due to out-of-date plugin left
behind from earlier installation. (Bug 7401)
Versions affected: 1.8.0 to 1.8.1.
o Failed to dissect TLS handshake packets. (Bug 7435)
CVE-2012-4286
o ISUP dissector problem with empty Generic Number. (Bug 7632)
o wnpa-sec-2012-25
o Illegal character is used in temporary capture file name. (Bug
7877)
The Ixia IxVeriWave file parser could overflow a buffer. (Bug
7533)
o Lua code crashes wireshark after update to 1.8.3. (Bug 7976)
Versions affected: 1.8.0 to 1.8.1.
o Timestamp info is not saved correctly when writing DOS Sniffer
files. (Bug 7998)
CVE-2012-4298
o 1.8.3 Wireshark User's Guide version is 1.6. (Bug 8009)
The following bugs have been fixed:
o Core dumped when the file is closed. (Bug 8022)
o Move Y.1711 out of MPLS dissector. (Bug 6787)
o LPP is misspelled in APDU parameter in
e-CIDMeasurementInitiation request for LPPA message. (Bug
8023)
o Patch: Add frame.interface_id support for ERF file format.
(Bug 7266)
o Wrong packet bytes are selected for ISUP CUG binary code. (Bug
8035)
o Freeze when Resizing or Moving while capturing. (Bug 7305)
o Decodes FCoE Group Multicast MAC address as Broadcom MAC
address. (Bug 8046)
o Wireshark crashes when using multiple files. (Bug 7423)
o The SSL dissector stops decrypting the SSL conversation with
Malformed Packet:SSL error messages. (Bug 8075)
o Wireshark crashes on opening very short NFS pcap file. (Bug
7498)
o Unable to Save/Apply [Unistim Port] in Preferences. (Bug 8078)
o Analyze->Apply as Filter and Analyze->Prepare a Filter cause
crashes. (Bug 7506)
o Some Information Elements in GTPv2 are not dissected
correctly. (Bug 8079)
o crashes in interface list, pipe handling. (Bug 7511)
o Wrong bytes highlighted with "Find Packet...". (Bug 8085)
o ISDN LAPD X.31 packet traffic can not be decoded. (Bug 7514)
o 3GPP ULI AVP. SAI is not correctly decoded. (Bug 8098)
o GIOP request_id used for sub dissectors is not assigned when
decoding GIOP 1.2 Request message. (Bug 7516)
o Wireshark does not show "Start and End Time" information for
Cisco Netflow/IPFIX with type 154 to 157. (Bug 8105)
o pcap-ng -ISB always writes 0 for isb_ifrecv option. (Bug 7523)
o GPRS Tunnel Protocoll GTP Version 1 does not decode DAF flag
in Common Flags IE. (Bug 8193)
o GSM classmark3 decode wrong. (Bug 7524)
o Wrong parcing of ULI of gtpv2 messages - errors in SAC, RAC &
ECI. (Bug 8208)
o mem corruption\heap corruption\div0 bugs. (Bug 7533)
o Version Number in EtherIP dissector. (Bug 8211)
o DNS AD flag not shown properly. (Bug 7555)
o Warn Dissector bug, protocol JXTA. (Bug 8212)
o Wireshark and TShark crash at start with invalid color filter
on SPARC. (Bug 7634)
o Electromagnetic Emission Parser parses field Event Id as
Entity Id. (Bug 8227)
New and Updated Features
......@@ -184,14 +170,15 @@ What's New
Updated Protocol Support
AFP, Apache JServ Protocol v1.3, Bluetooth L2CAP, CIP, CTDB, DCP
ETSI, ERF, EtherCAT Mailbox, FC Link Control, GIOP, GSM A, GSM RLC
MAC, GTP, GTPv2, ISDN, LISP, MongoDB, MPLS ITU-T Y.1711 OAM, MPLS
PM, NFS, RTPS2, SCTP, STUN, XTP
ANSI IS-637-A, ASN.1 PER, AX.25, Bluetooth HCI, CLNP, CSN.1,
DCP-ETSI, DIAMETER, DIS PDU, DOCSIS CM-STATUS, DTLS, DTN, EtherIP,
Fibre Channel, GPRS, GTP, GTPv2, HomePlug AV, IEEE 802.3 Slow,
IEEE 802.15.4, ISUP, JXTA, LAPD, LPPa, MPLS, MS-MMC, NAS-EPS,
NTLMSSP, ROHC, RSL, RTPS, SDP, SIP, SNMP, SSL
New and Updated Capture File Support
Ixia IxVeriWave, pcap-ng
DOS Sniffer
Getting Wireshark
......
......@@ -2,7 +2,7 @@
* Routines for ANSI C12.22 packet dissection
* Copyright 2010, Edward J. Beroset, edward.j.beroset@us.elster.com
*
* $Id: packet-c1222-template.c 42840 2012-05-25 00:29:46Z cmaynard $
* $Id: packet-c1222-template.c 47325 2013-01-28 18:02:58Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
......
......@@ -3,7 +3,7 @@
* Ronnie Sahlberg 2004
* Stig Bjorlykke 2010
*
* $Id: packet-ess-template.c 34694 2010-10-29 21:11:33Z guy $
* $Id: packet-ess-template.c 47325 2013-01-28 18:02:58Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
......
......@@ -2,7 +2,7 @@
* Routines for h245 packet dissection
* Copyright 2004, Anders Broman <anders.broman@ericsson.com>
*
* $Id: packet-h245-template.c 38897 2011-09-06 15:05:26Z etxrab $
* $Id: packet-h245-template.c 44968 2012-09-18 08:16:28Z etxrab $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
......@@ -336,15 +336,6 @@ static void update_unicast_addr(unicast_addr_t *req_addr, unicast_addr_t *ack_ad
}
}
static void free_encoding_name_str (void *ptr)
{
encoding_name_and_rate_t *encoding_name_and_rate = (encoding_name_and_rate_t *)ptr;
if (encoding_name_and_rate->encoding_name) {
g_free(encoding_name_and_rate->encoding_name);
}
}
static void h245_setup_channels(packet_info *pinfo, channel_info_t *upcoming_channel_lcl)
{
gint *key;
......@@ -365,11 +356,11 @@ static void h245_setup_channels(packet_info *pinfo, channel_info_t *upcoming_cha
/* (S)RTP, (S)RTCP */
if (upcoming_channel_lcl->rfc2198 > 0) {
encoding_name_and_rate_t *encoding_name_and_rate = g_malloc( sizeof(encoding_name_and_rate_t));
rtp_dyn_payload = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, free_encoding_name_str);
encoding_name_and_rate->encoding_name = g_strdup("red");
encoding_name_and_rate_t *encoding_name_and_rate = se_alloc( sizeof(encoding_name_and_rate_t));
rtp_dyn_payload = g_hash_table_new(g_int_hash, g_int_equal);
encoding_name_and_rate->encoding_name = se_strdup("red");
encoding_name_and_rate->sample_rate = 8000;
key = g_malloc(sizeof(gint));
key = se_alloc(sizeof(gint));
*key = upcoming_channel_lcl->rfc2198;
g_hash_table_insert(rtp_dyn_payload, key, encoding_name_and_rate);
}
......
......@@ -3,7 +3,7 @@
*
* See RFC 1777 (LDAP v2), RFC 4511 (LDAP v3), and RFC 2222 (SASL).
*
* $Id: packet-ldap-template.c 43064 2012-06-04 12:20:37Z etxrab $
* $Id: packet-ldap-template.c 47325 2013-01-28 18:02:58Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
......
# lpp.cnf
# llp conformation file
# Copyright 2011 Pascal Quantin
# $Id: lpp.cnf 42716 2012-05-19 16:06:12Z pascal $
# $Id: lpp.cnf 44563 2012-08-18 18:27:05Z pascal $
#.OPT
PER
......@@ -30,10 +30,20 @@ HorizontalVelocity
# Handle 64 bit constraint
#.FN_PARS NavModelCNAV-KeplerianSet/cnavMo FN_VARIANT = _64b
#.TYPE_ATTR
NavModelCNAV-KeplerianSet/cnavMo TYPE = FT_INT64
#.FN_PARS NavModelCNAV-KeplerianSet/cnavE FN_VARIANT = _64b
#.TYPE_ATTR
NavModelCNAV-KeplerianSet/cnavE TYPE = FT_UINT64
#.FN_PARS NavModelCNAV-KeplerianSet/cnavOmega FN_VARIANT = _64b
#.TYPE_ATTR
NavModelCNAV-KeplerianSet/cnavOmega TYPE = FT_INT64
#.FN_PARS NavModelCNAV-KeplerianSet/cnavOMEGA0 FN_VARIANT = _64b
#.TYPE_ATTR
NavModelCNAV-KeplerianSet/cnavOMEGA0 TYPE = FT_INT64
#.FN_PARS NavModelCNAV-KeplerianSet/cnavIo FN_VARIANT = _64b
#.TYPE_ATTR
NavModelCNAV-KeplerianSet/cnavIo TYPE = FT_INT64
#.FN_HDR RequestCapabilities
......
......@@ -2,7 +2,7 @@
* Routines for 3GPP LTE Positioning Protocol A (LLPa) packet dissection
* Copyright 2011, Pascal Quantin <pascal.quantin@gmail.com>
*
* $Id: packet-lppa-template.c 39847 2011-11-15 15:02:01Z wmeier $
* $Id: packet-lppa-template.c 46639 2012-12-20 16:19:50Z etxrab $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
......@@ -20,7 +20,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Ref 3GPP TS 36.455 version 9.4.1 Release 9
* http://www.3gpp.org
......@@ -36,7 +36,7 @@
#include "packet-per.h"
#define PNAME "LTE Positioning Protocol A (LLPa)"
#define PNAME "LTE Positioning Protocol A (LPPa)"
#define PSNAME "LPPa"
#define PFNAME "lppa"
......
This diff is collapsed.
......@@ -4,7 +4,7 @@
* (3GPP TS 36.331 V10.5.0 Release 10) packet dissection
* Copyright 2008, Vincent Helfre
*
* $Id: packet-lte-rrc-template.c 42913 2012-05-30 08:49:56Z pascal $
* $Id: packet-lte-rrc-template.c 45982 2012-11-09 12:25:14Z etxrab $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
......@@ -22,7 +22,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
*/
......@@ -2174,6 +2174,7 @@ void proto_register_lte_rrc(void) {
&ett_lte_rrc_featureGroupIndRel10,
&ett_lte_rrc_neighCellConfig,
&ett_lte_rrc_absTimeInfo,
&ett_lte_rrc_nas_SecurityParam
};
......
# pcap.cnf
# pcap conformation file
# $Id: pcap.cnf 34929 2010-11-17 16:23:10Z etxrab $
# $Id: pcap.cnf 44563 2012-08-18 18:27:05Z pascal $
#.OPT
PER
......@@ -415,5 +415,6 @@ PositionPeriodicTermination N pcap.proc.imsg id-PositionPeriodicTermination
UTRAN-GPSReferenceTimeResult/ue-GPSTimingOfCell TYPE = FT_UINT64 DISPLAY = BASE_DEC STRINGS = NULL
UTRAN-GANSSReferenceTimeUL/ue-GANSSTimingOfCellFrames TYPE = FT_UINT64 DISPLAY = BASE_DEC STRINGS = NULL
UTRAN-GPSReferenceTime/utran-GPSTimingOfCell TYPE = FT_UINT64 DISPLAY = BASE_DEC STRINGS = NULL
UTRAN-GANSSReferenceTimeResult/ue-GANSSTimingOfCell TYPE = FT_UINT64 DISPLAY = BASE_DEC STRINGS = NULL
#.END
\ No newline at end of file
......@@ -3,7 +3,7 @@
* Based on the dissector by
* Yuriy Sidelnikov <YSidelnikov@hotmail.com>
*
* $Id: packet-pres-template.c 41300 2012-03-02 11:02:46Z alagoutte $
* $Id: packet-pres-template.c 47325 2013-01-28 18:02:58Z gerald $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
......
# ranap.cnf
# ranap conformation file
# $Id: ranap.cnf 42531 2012-05-10 01:08:50Z guy $
# $Id: ranap.cnf 44563 2012-08-18 18:27:05Z pascal $
#.OPT
PER
......@@ -367,10 +367,6 @@ dissect_ranap_SourceRNC_ToTargetRNC_TransparentContainer(tvb , offset, actx ,tre
dissect_ranap_TargetRNC_ToSourceRNC_TransparentContainer(tvb , offset, actx ,tree , hf_ranap_ranap_TargetRNC_ToSourceRNC_TransparentContainer_PDU );
# Handle 64 bit constraint
#.FN_PARS UE-AggregateMaximumBitRateDownlink FN_VARIANT = _64b
#.FN_PARS UE-AggregateMaximumBitRateUplink FN_VARIANT = _64b
#.TYPE_ATTR
ProtocolExtensionID TYPE = FT_UINT8 DISPLAY = BASE_DEC|BASE_EXT_STRING STRINGS = &ranap_ProtocolIE_ID_vals_ext
GTP-TEI TYPE = FT_UINT32 DISPLAY = BASE_HEX_DEC STRINGS = NULL
......
-- $Id: PDU-definitions.asn 42081 2012-04-15 11:51:40Z pascal $
-- $Id: PDU-definitions.asn 46203 2012-11-26 13:24:58Z pascal $
-- PDU-definitions.asn
--
-- 3GPP TS 25.331 V10.7.0 (2012-03)
......@@ -7284,7 +7284,7 @@ RRCConnectionRequest ::= SEQUENCE {
rrcConnectionRequest-v940ext
RRCConnectionRequest-v940ext-IEs,
va40NonCriticalExtensions
RRCConnectionRequest-NonCriticalExts-va40-IEs
RRCConnectionRequest-NonCriticalExts-va40-IEs OPTIONAL