[wireshark] Fix error in the backported RTPproxy patches
Peter Lemenkov
peter at fedoraproject.org
Mon Dec 9 09:15:39 UTC 2013
commit 16ed22d47a442817b71cb297715e774f8bce548e
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Mon Dec 9 13:15:34 2013 +0400
Fix error in the backported RTPproxy patches
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
...Lemenkov-via-https-bugs.wireshark.org-bug.patch | 4 ++--
wireshark.spec | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/wireshark-0006-From-Peter-Lemenkov-via-https-bugs.wireshark.org-bug.patch b/wireshark-0006-From-Peter-Lemenkov-via-https-bugs.wireshark.org-bug.patch
index 13ff90e..491a8c7 100644
--- a/wireshark-0006-From-Peter-Lemenkov-via-https-bugs.wireshark.org-bug.patch
+++ b/wireshark-0006-From-Peter-Lemenkov-via-https-bugs.wireshark.org-bug.patch
@@ -192,7 +192,7 @@ index 937f522..73217d7 100644
packet-rudp.c \
diff --git a/epan/dissectors/packet-rtpproxy.c b/epan/dissectors/packet-rtpproxy.c
new file mode 100644
-index 0000000..1a80ee7
+index 0000000..0afee3a
--- /dev/null
+++ b/epan/dissectors/packet-rtpproxy.c
@@ -0,0 +1,1387 @@
@@ -808,7 +808,7 @@ index 0000000..1a80ee7
+ 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);
+ 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 */
+ offset = tvb_skip_wsp(tvb, new_offset+1, -1);
+
diff --git a/wireshark.spec b/wireshark.spec
index e2e9413..ea002ab 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -21,7 +21,7 @@
Summary: Network traffic analyzer
Name: wireshark
Version: 1.10.3
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPL+
Group: Applications/Internet
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/*
%changelog
+* Mon Dec 09 2013 Peter Lemenkov <lemenkov at gmail.com> - 1.10.3-7
+- Fix error in the backported RTPproxy patches
+
* Fri Dec 06 2013 Peter Lemenkov <lemenkov at gmail.com> - 1.10.3-6
- Updated RTPproxy dissector (again), squashed patch no. 15 (applied upstream).
- Use proper soname in the python scripts
More information about the scm-commits
mailing list