Fix error in the backported RTPproxy patches

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
This commit is contained in:
Peter Lemenkov 2013-12-09 13:15:34 +04:00
parent 61af307f0c
commit 16ed22d47a
2 changed files with 6 additions and 3 deletions

View File

@ -192,7 +192,7 @@ index 937f522..73217d7 100644
packet-rudp.c \ packet-rudp.c \
diff --git a/epan/dissectors/packet-rtpproxy.c b/epan/dissectors/packet-rtpproxy.c diff --git a/epan/dissectors/packet-rtpproxy.c b/epan/dissectors/packet-rtpproxy.c
new file mode 100644 new file mode 100644
index 0000000..1a80ee7 index 0000000..0afee3a
--- /dev/null --- /dev/null
+++ b/epan/dissectors/packet-rtpproxy.c +++ b/epan/dissectors/packet-rtpproxy.c
@@ -0,0 +1,1387 @@ @@ -0,0 +1,1387 @@
@ -808,7 +808,7 @@ index 0000000..1a80ee7
+ new_offset = tvb_find_guint8(tvb, offset, -1, ' '); + new_offset = tvb_find_guint8(tvb, offset, -1, ' ');
+ proto_tree_add_item(rtpproxy_tree, hf_rtpproxy_callid, tvb, offset, new_offset - offset, ENC_ASCII | ENC_NA); + proto_tree_add_item(rtpproxy_tree, hf_rtpproxy_callid, tvb, offset, new_offset - offset, ENC_ASCII | ENC_NA);
+ if(rtpproxy_info && !rtpproxy_info->callid) + if(rtpproxy_info && !rtpproxy_info->callid)
+ rtpproxy_info->callid = tvb_get_ephemeral_string(tvb, offset, new_offset - offset); + rtpproxy_info->callid = tvb_get_seasonal_string(tvb, offset, new_offset - offset);
+ /* Skip whitespace */ + /* Skip whitespace */
+ offset = tvb_skip_wsp(tvb, new_offset+1, -1); + offset = tvb_skip_wsp(tvb, new_offset+1, -1);
+ +

View File

@ -21,7 +21,7 @@
Summary: Network traffic analyzer Summary: Network traffic analyzer
Name: wireshark Name: wireshark
Version: 1.10.3 Version: 1.10.3
Release: 6%{?dist} Release: 7%{?dist}
License: GPL+ License: GPL+
Group: Applications/Internet Group: Applications/Internet
Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2 Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
@ -366,6 +366,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/aclocal/* %{_datadir}/aclocal/*
%changelog %changelog
* Mon Dec 09 2013 Peter Lemenkov <lemenkov@gmail.com> - 1.10.3-7
- Fix error in the backported RTPproxy patches
* Fri Dec 06 2013 Peter Lemenkov <lemenkov@gmail.com> - 1.10.3-6 * Fri Dec 06 2013 Peter Lemenkov <lemenkov@gmail.com> - 1.10.3-6
- Updated RTPproxy dissector (again), squashed patch no. 15 (applied upstream). - Updated RTPproxy dissector (again), squashed patch no. 15 (applied upstream).
- Use proper soname in the python scripts - Use proper soname in the python scripts