diff --git a/.gitignore b/.gitignore index 1592d25..fb5f3ea 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ wireshark-1.2.10.tar.bz2 /wireshark-1.10.0.tar.bz2 /wireshark-1.10.1.tar.bz2 /wireshark-1.10.2.tar.bz2 +/wireshark-1.10.3.tar.bz2 diff --git a/sources b/sources index 6b22136..6c49e7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cd7fedd0a67df5ad4905fd356efdc1e8 wireshark-1.10.2.tar.bz2 +ceb4b2bac5607d948e00bd950461be1c wireshark-1.10.3.tar.bz2 diff --git a/wireshark-0001-enable-Lua-support.patch b/wireshark-0001-enable-Lua-support.patch index 8625b3d..6229d77 100644 --- a/wireshark-0001-enable-Lua-support.patch +++ b/wireshark-0001-enable-Lua-support.patch @@ -1,7 +1,7 @@ -From e8be5a7c24830ce686cec89dac060b3c0495b70e Mon Sep 17 00:00:00 2001 +From 9d38601b45c6bce770946ac3c36a675a2f1a4359 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Radek=20Vok=C3=A1l?= Date: Tue, 15 Dec 2009 08:36:27 +0000 -Subject: [PATCH 01/14] enable Lua support +Subject: [PATCH 01/13] enable Lua support --- epan/wslua/template-init.lua | 2 +- diff --git a/wireshark-0002-Customize-permission-denied-error.patch b/wireshark-0002-Customize-permission-denied-error.patch index f6d9dae..a4ba8ee 100644 --- a/wireshark-0002-Customize-permission-denied-error.patch +++ b/wireshark-0002-Customize-permission-denied-error.patch @@ -1,7 +1,7 @@ -From a6168e1f1bdb639c0ffd15a5f4eed864814e0bce Mon Sep 17 00:00:00 2001 +From d7b9380cb2b827fb627f82a1c3b73496b089b8dd Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Fri, 26 Nov 2010 14:30:45 +0300 -Subject: [PATCH 02/14] Customize 'permission denied' error. +Subject: [PATCH 02/13] Customize 'permission denied' error. Add Fedora-specific message to error output when dumpcap cannot be started because of permissions. diff --git a/wireshark-0003-Load-correct-shared-object-name-in-python.patch b/wireshark-0003-Load-correct-shared-object-name-in-python.patch index 1a831f4..e962fb6 100644 --- a/wireshark-0003-Load-correct-shared-object-name-in-python.patch +++ b/wireshark-0003-Load-correct-shared-object-name-in-python.patch @@ -1,7 +1,7 @@ -From ec02325332d4e198b1ccd6955ed6a489a5a7c826 Mon Sep 17 00:00:00 2001 +From 0d0f937fcbb73fb36a44bd7061817ff1cdac0032 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Thu, 9 Jun 2011 14:56:59 +0200 -Subject: [PATCH 03/14] Load correct shared object name in python. +Subject: [PATCH 03/13] Load correct shared object name in python. This fixes following error message shown by wireshark/tshark when wireshark-devel was not installed: diff --git a/wireshark-0004-fix-documentation-build-error.patch b/wireshark-0004-fix-documentation-build-error.patch index bbbdf80..201c04b 100644 --- a/wireshark-0004-fix-documentation-build-error.patch +++ b/wireshark-0004-fix-documentation-build-error.patch @@ -1,7 +1,7 @@ -From 5dab288d99b6847ca5ecd98ae5bdb95402fa5cd0 Mon Sep 17 00:00:00 2001 +From 8e34a9a261f26ceabc39ea373d9025a24805b832 Mon Sep 17 00:00:00 2001 From: Peter Hatina Date: Mon, 8 Apr 2013 13:03:24 +0200 -Subject: [PATCH 04/14] fix documentation build error +Subject: [PATCH 04/13] fix documentation build error --- doc/asn2deb.pod | 1 + diff --git a/wireshark-0005-fix-string-overrun-in-plugins-profinet.patch b/wireshark-0005-fix-string-overrun-in-plugins-profinet.patch index ce0054e..c42095f 100644 --- a/wireshark-0005-fix-string-overrun-in-plugins-profinet.patch +++ b/wireshark-0005-fix-string-overrun-in-plugins-profinet.patch @@ -1,7 +1,7 @@ -From 396979b80d273319cd69084e262567aae0024b25 Mon Sep 17 00:00:00 2001 +From dfd843cda67cfd9b785b44f5096a185c04c08be8 Mon Sep 17 00:00:00 2001 From: Peter Hatina Date: Wed, 4 Sep 2013 10:03:57 +0200 -Subject: [PATCH 05/14] fix string overrun in plugins/profinet +Subject: [PATCH 05/13] fix string overrun in plugins/profinet --- plugins/profinet/packet-dcom-cba.c | 2 +- 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 ea6d2f1..b462822 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 @@ -1,7 +1,7 @@ -From 3c9d2b8cefb0204bf2b83ac925e80e775945e57f Mon Sep 17 00:00:00 2001 +From b516cc6516b505b264bd75ef5e574490f22912e5 Mon Sep 17 00:00:00 2001 From: Evan Huus Date: Sun, 18 Aug 2013 19:49:08 +0000 -Subject: [PATCH 06/14] From Peter Lemenkov via +Subject: [PATCH 06/13] From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8326 Dissector for the Sippy RTPproxy controlling protocol. RTPproxy is a well-known @@ -34,25 +34,28 @@ Fix Coverity CID 1063335: Unused pointer value. svn path=/trunk/; revision=51430 --- - AUTHORS | 1 + + AUTHORS | 2 +- epan/CMakeLists.txt | 1 + epan/dissectors/Makefile.common | 1 + epan/dissectors/packet-rtpproxy.c | 808 ++++++++++++++++++++++++++++++++++++++ - 4 files changed, 811 insertions(+) + 4 files changed, 811 insertions(+), 1 deletion(-) create mode 100644 epan/dissectors/packet-rtpproxy.c diff --git a/AUTHORS b/AUTHORS -index aa446db..ac40c25 100644 +index 10782b0..4c77f60 100644 --- a/AUTHORS +++ b/AUTHORS -@@ -3733,6 +3733,7 @@ Max Baker +@@ -3733,9 +3733,9 @@ Max Baker Mike Garratt Bart Van Assche Karl Beldan +Peter Lemenkov + Masayuki Takemura +- Dan Lasley gave permission for his dumpit() hex-dump routine to be used. + diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 69eb75f..610cea7 100644 --- a/epan/CMakeLists.txt diff --git a/wireshark-0007-The-beginning-of-an-openflow-dissector.patch b/wireshark-0007-The-beginning-of-an-openflow-dissector.patch index 22d614f..a47dc62 100644 --- a/wireshark-0007-The-beginning-of-an-openflow-dissector.patch +++ b/wireshark-0007-The-beginning-of-an-openflow-dissector.patch @@ -1,7 +1,7 @@ -From 876cb9d160cd8cd4042cdc7a01981d0ae2dbee06 Mon Sep 17 00:00:00 2001 +From 9bad0b9e84deabc2b65cee6a650b68866d7d70f3 Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Thu, 11 Jul 2013 21:13:27 +0000 -Subject: [PATCH 07/14] The beginning of an openflow dissector. +Subject: [PATCH 07/13] The beginning of an openflow dissector. svn path=/trunk/; revision=50513 diff --git a/wireshark-0008-adds-autoconf-macro-file.patch b/wireshark-0008-adds-autoconf-macro-file.patch index 54febf4..a7e733a 100644 --- a/wireshark-0008-adds-autoconf-macro-file.patch +++ b/wireshark-0008-adds-autoconf-macro-file.patch @@ -1,7 +1,7 @@ -From 0422c8801690fa8dde284f4e8781f31d69b44326 Mon Sep 17 00:00:00 2001 +From b30893997caf826b0ebdc7e0cb6d5e1f89bbd08e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Radek=20Vok=C3=A1l?= Date: Mon, 21 Dec 2009 11:19:39 +0000 -Subject: [PATCH 08/14] adds autoconf macro file +Subject: [PATCH 08/13] adds autoconf macro file updated autoconf macros and pkgconfig file in wireshark-devel to reflect current config.h Resolves: #746655 --- diff --git a/wireshark-0009-Restore-Fedora-specific-groups.patch b/wireshark-0009-Restore-Fedora-specific-groups.patch index 902ab9e..e8246a7 100644 --- a/wireshark-0009-Restore-Fedora-specific-groups.patch +++ b/wireshark-0009-Restore-Fedora-specific-groups.patch @@ -1,7 +1,7 @@ -From f49769f56e1e6a22ca235e8f2b73337309ddcfa2 Mon Sep 17 00:00:00 2001 +From 8e0c0df6291f9e8948d6653230bdc59692803890 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 13 Sep 2013 14:36:55 +0400 -Subject: [PATCH 09/14] Restore Fedora-specific groups +Subject: [PATCH 09/13] Restore Fedora-specific groups Signed-off-by: Peter Lemenkov --- diff --git a/wireshark-0010-Add-pkgconfig-entry.patch b/wireshark-0010-Add-pkgconfig-entry.patch index 6ddfd07..358a074 100644 --- a/wireshark-0010-Add-pkgconfig-entry.patch +++ b/wireshark-0010-Add-pkgconfig-entry.patch @@ -1,7 +1,7 @@ -From 224cd146ec71d0ff7bdff3e8d7707ca603220410 Mon Sep 17 00:00:00 2001 +From a5f6e0766675cf2e6f7104a04d9d73eca2c6796d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Radek=20Vok=C3=A1l?= Date: Thu, 17 Dec 2009 09:17:07 +0000 -Subject: [PATCH 10/14] Add pkgconfig entry +Subject: [PATCH 10/13] Add pkgconfig entry --- Makefile.am | 3 +++ @@ -25,7 +25,7 @@ index eb735a5..2844c90 100644 # Wireshark configuration files are put in $(pkgdatadir). # diff --git a/configure.ac b/configure.ac -index cfa8f05..a9f77a7 100644 +index 6c05883..5cae378 100644 --- a/configure.ac +++ b/configure.ac @@ -2543,6 +2543,7 @@ AC_CONFIG_HEADERS(config.h) diff --git a/wireshark-0011-Install-autoconf-related-file.patch b/wireshark-0011-Install-autoconf-related-file.patch index be39f95..14fd4f5 100644 --- a/wireshark-0011-Install-autoconf-related-file.patch +++ b/wireshark-0011-Install-autoconf-related-file.patch @@ -1,7 +1,7 @@ -From fa0c546efa38a9f112257b3b3a1be15ba4cb3d4b Mon Sep 17 00:00:00 2001 +From 44ac61f5942aa0a58f6a85781666b178244e89cd Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 13 Sep 2013 15:25:12 +0400 -Subject: [PATCH 11/14] Install autoconf-related file +Subject: [PATCH 11/13] Install autoconf-related file --- Makefile.am | 3 ++ diff --git a/wireshark-0012-move-default-temporary-directory-to-var-tmp.patch b/wireshark-0012-move-default-temporary-directory-to-var-tmp.patch new file mode 100644 index 0000000..c519acc --- /dev/null +++ b/wireshark-0012-move-default-temporary-directory-to-var-tmp.patch @@ -0,0 +1,244 @@ +From aaf8ad314b952c61c9b569ac22c2765f5e6653d7 Mon Sep 17 00:00:00 2001 +From: Peter Hatina +Date: Tue, 24 Sep 2013 10:55:09 +0200 +Subject: [PATCH 12/13] move default temporary directory to /var/tmp + +--- + epan/filesystem.c | 4 ++- + tempfile.c | 7 ++--- + ui/gtk/proto_help.c | 4 ++- + wsutil/Makefile.common | 6 +++-- + wsutil/wstmpdir.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++ + wsutil/wstmpdir.h | 39 ++++++++++++++++++++++++++++ + 6 files changed, 123 insertions(+), 7 deletions(-) + create mode 100644 wsutil/wstmpdir.c + create mode 100644 wsutil/wstmpdir.h + +diff --git a/epan/filesystem.c b/epan/filesystem.c +index 053711d..adf3b91 100644 +--- a/epan/filesystem.c ++++ b/epan/filesystem.c +@@ -74,6 +74,8 @@ + + #include /* for WTAP_ERR_SHORT_WRITE */ + ++#include /* for get_tmp_dir() */ ++ + #define PROFILES_DIR "profiles" + #define PLUGINS_DIR_NAME "plugins" + +@@ -1574,7 +1576,7 @@ deletefile(const char *path) + */ + char *get_tempfile_path(const char *filename) + { +- return g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", g_get_tmp_dir(), filename); ++ return g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", get_tmp_dir(), filename); + } + + /* +diff --git a/tempfile.c b/tempfile.c +index 2fab0df..10ab3e6 100644 +--- a/tempfile.c ++++ b/tempfile.c +@@ -50,6 +50,7 @@ + + #include "tempfile.h" + #include ++#include /* For get_tmp_dir() */ + + #ifndef __set_errno + #define __set_errno(x) errno=(x) +@@ -203,7 +204,7 @@ create_tempfile(char **namebuf, const char *pfx) + /* + * We can't use get_tempfile_path here because we're called from dumpcap.c. + */ +- tmp_dir = g_get_tmp_dir(); ++ tmp_dir = get_tmp_dir(); + + #ifdef _WIN32 + _tzset(); +@@ -237,7 +238,7 @@ create_tempfile(char **namebuf, const char *pfx) + + /** + * Create a directory with the given prefix (e.g. "wireshark"). The path +- * is created using g_get_tmp_dir and mkdtemp. ++ * is created using get_tmp_dir and mkdtemp. + * + * @param namebuf + * @param pfx A prefix for the temporary directory. +@@ -265,7 +266,7 @@ create_tempdir(char **namebuf, const char *pfx) + /* + * We can't use get_tempfile_path here because we're called from dumpcap.c. + */ +- tmp_dir = g_get_tmp_dir(); ++ tmp_dir = get_tmp_dir(); + + while (g_snprintf(td_path[idx], td_path_len[idx], "%s%c%s" TMP_FILE_SUFFIX, tmp_dir, G_DIR_SEPARATOR, pfx) > td_path_len[idx]) { + td_path_len[idx] *= 2; +diff --git a/ui/gtk/proto_help.c b/ui/gtk/proto_help.c +index bbf5fe0..9998a22 100644 +--- a/ui/gtk/proto_help.c ++++ b/ui/gtk/proto_help.c +@@ -44,6 +44,8 @@ + #include + #include + ++#include /* for get_tmp_dir() */ ++ + #include "ui/gtk/proto_help.h" + + /* +@@ -162,7 +164,7 @@ void proto_help_init(void) + /* Start loop */ + + #ifdef PH_DEBUG_LOG +- ph_log_path = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", g_get_tmp_dir(), PH_FILE_LOG); ++ ph_log_path = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", get_tmp_dir(), PH_FILE_LOG); + #endif + + for (i = 0; i < PH_CONF_DIRS; i++) { +diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common +index 570dbe6..7a33f5b 100644 +--- a/wsutil/Makefile.common ++++ b/wsutil/Makefile.common +@@ -43,7 +43,8 @@ LIBWSUTIL_SRC = \ + mpeg-audio.c \ + privileges.c \ + str_util.c \ +- type_util.c ++ type_util.c \ ++ wstmpdir.c + + # Header files that are not generated from other files + LIBWSUTIL_INCLUDES = \ +@@ -60,4 +61,5 @@ LIBWSUTIL_INCLUDES = \ + mpeg-audio.h \ + privileges.h \ + str_util.h \ +- type_util.h ++ type_util.h \ ++ wstmpdir.h +diff --git a/wsutil/wstmpdir.c b/wsutil/wstmpdir.c +new file mode 100644 +index 0000000..d8b733b +--- /dev/null ++++ b/wsutil/wstmpdir.c +@@ -0,0 +1,70 @@ ++/* wstmpdir.c ++ * ++ * Copyright (C) 2013 Red Hat, Inc. All right reserved. ++ * ++ * Temporary directory routine ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version 2 ++ * of the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Author: Peter Hatina ++ */ ++ ++#include "config.h" ++ ++#include ++#include "wstmpdir.h" ++ ++/** ++ * Gets the directory to use for temporary files. ++ * ++ * Inspired by glib-2.0. If no TMP, TEMP or TMPDIR is set, ++ * /var/tmp is returned (Fedora specific). ++ * ++ * Returns: the directory to use for temporary files. ++ */ ++const char *get_tmp_dir(void) ++{ ++ static gchar *tmp_dir; ++ ++ if (g_once_init_enter(&tmp_dir)) { ++ gchar *tmp; ++ ++ tmp = g_strdup(g_getenv("TEMP")); ++ if (tmp == NULL || *tmp == '\0') { ++ g_free(tmp); ++ tmp = g_strdup(g_getenv("TMPDIR")); ++ } ++ ++#ifdef P_tmpdir ++ if (tmp == NULL || *tmp == '\0') { ++ gsize k; ++ g_free(tmp); ++ tmp = g_strdup(P_tmpdir); ++ k = strlen(tmp); ++ if (k > 1 && G_IS_DIR_SEPARATOR(tmp[k - 1])) ++ tmp[k - 1] = '\0'; ++ } ++#endif /* P_tmpdir */ ++ ++ if (tmp == NULL || *tmp == '\0') { ++ g_free(tmp); ++ tmp = g_strdup("/var/tmp"); ++ } ++ ++ g_once_init_leave(&tmp_dir, tmp); ++ } ++ ++ return tmp_dir; ++} +diff --git a/wsutil/wstmpdir.h b/wsutil/wstmpdir.h +new file mode 100644 +index 0000000..021b615 +--- /dev/null ++++ b/wsutil/wstmpdir.h +@@ -0,0 +1,39 @@ ++/* wstmpdir.c ++ * ++ * Copyright (C) 2013 Red Hat, Inc. All right reserved. ++ * ++ * Temporary directory routine ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version 2 ++ * of the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Author: Peter Hatina ++ */ ++ ++#ifndef __WS_TMP_DIR_H__ ++#define __WS_TMP_DIR_H__ ++ ++#include "ws_symbol_export.h" ++ ++#ifdef __cplusplus ++extern "C" { ++#endif // __cplusplus ++ ++WS_DLL_PUBLIC const char *get_tmp_dir(void); ++ ++#ifdef __cplusplus ++} ++#endif // __cplusplus ++ ++#endif // __WS_TMP_DIR_H__ +-- +1.8.3.1 + diff --git a/wireshark-0012-tmp-dir.patch b/wireshark-0012-tmp-dir.patch deleted file mode 100644 index bbd3dd4..0000000 --- a/wireshark-0012-tmp-dir.patch +++ /dev/null @@ -1,225 +0,0 @@ -diff --git a/epan/filesystem.c b/epan/filesystem.c -index 89edb8a..00acdd9 100644 ---- a/epan/filesystem.c -+++ b/epan/filesystem.c -@@ -74,6 +74,8 @@ - - #include /* for WTAP_ERR_SHORT_WRITE */ - -+#include /* for get_tmp_dir() */ -+ - #define PROFILES_DIR "profiles" - #define PLUGINS_DIR_NAME "plugins" - -@@ -1574,7 +1576,7 @@ deletefile(const char *path) - */ - char *get_tempfile_path(const char *filename) - { -- return g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", g_get_tmp_dir(), filename); -+ return g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", get_tmp_dir(), filename); - } - - /* -diff --git a/tempfile.c b/tempfile.c -index 9a236df..ab6d1dc 100644 ---- a/tempfile.c -+++ b/tempfile.c -@@ -50,6 +50,7 @@ - - #include "tempfile.h" - #include -+#include /* For get_tmp_dir() */ - - #ifndef __set_errno - #define __set_errno(x) errno=(x) -@@ -203,7 +204,7 @@ create_tempfile(char **namebuf, const char *pfx) - /* - * We can't use get_tempfile_path here because we're called from dumpcap.c. - */ -- tmp_dir = g_get_tmp_dir(); -+ tmp_dir = get_tmp_dir(); - - #ifdef _WIN32 - _tzset(); -@@ -237,7 +238,7 @@ create_tempfile(char **namebuf, const char *pfx) - - /** - * Create a directory with the given prefix (e.g. "wireshark"). The path -- * is created using g_get_tmp_dir and mkdtemp. -+ * is created using get_tmp_dir and mkdtemp. - * - * @param namebuf - * @param pfx A prefix for the temporary directory. -@@ -265,7 +266,7 @@ create_tempdir(char **namebuf, const char *pfx) - /* - * We can't use get_tempfile_path here because we're called from dumpcap.c. - */ -- tmp_dir = g_get_tmp_dir(); -+ tmp_dir = get_tmp_dir(); - - while (g_snprintf(td_path[idx], td_path_len[idx], "%s%c%s" TMP_FILE_SUFFIX, tmp_dir, G_DIR_SEPARATOR, pfx) > td_path_len[idx]) { - td_path_len[idx] *= 2; -diff --git a/ui/gtk/proto_help.c b/ui/gtk/proto_help.c -index 16dc24e..fe12c81 100644 ---- a/ui/gtk/proto_help.c -+++ b/ui/gtk/proto_help.c -@@ -44,6 +44,8 @@ - #include - #include - -+#include /* for get_tmp_dir() */ -+ - #include "ui/gtk/proto_help.h" - - /* -@@ -162,7 +164,7 @@ void proto_help_init(void) - /* Start loop */ - - #ifdef PH_DEBUG_LOG -- ph_log_path = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", g_get_tmp_dir(), PH_FILE_LOG); -+ ph_log_path = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", get_tmp_dir(), PH_FILE_LOG); - #endif - - for (i = 0; i < PH_CONF_DIRS; i++) { -diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common -index 93efa0f..ab8ce7d 100644 ---- a/wsutil/Makefile.common -+++ b/wsutil/Makefile.common -@@ -43,7 +43,8 @@ LIBWSUTIL_SRC = \ - mpeg-audio.c \ - privileges.c \ - str_util.c \ -- type_util.c -+ type_util.c \ -+ wstmpdir.c - - # Header files that are not generated from other files - LIBWSUTIL_INCLUDES = \ -@@ -60,4 +61,5 @@ LIBWSUTIL_INCLUDES = \ - mpeg-audio.h \ - privileges.h \ - str_util.h \ -- type_util.h -+ type_util.h \ -+ wstmpdir.h -diff --git a/wsutil/wstmpdir.c b/wsutil/wstmpdir.c -new file mode 100644 -index 0000000..d8b733b ---- /dev/null -+++ b/wsutil/wstmpdir.c -@@ -0,0 +1,70 @@ -+/* wstmpdir.c -+ * -+ * Copyright (C) 2013 Red Hat, Inc. All right reserved. -+ * -+ * Temporary directory routine -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2 -+ * of the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Author: Peter Hatina -+ */ -+ -+#include "config.h" -+ -+#include -+#include "wstmpdir.h" -+ -+/** -+ * Gets the directory to use for temporary files. -+ * -+ * Inspired by glib-2.0. If no TMP, TEMP or TMPDIR is set, -+ * /var/tmp is returned (Fedora specific). -+ * -+ * Returns: the directory to use for temporary files. -+ */ -+const char *get_tmp_dir(void) -+{ -+ static gchar *tmp_dir; -+ -+ if (g_once_init_enter(&tmp_dir)) { -+ gchar *tmp; -+ -+ tmp = g_strdup(g_getenv("TEMP")); -+ if (tmp == NULL || *tmp == '\0') { -+ g_free(tmp); -+ tmp = g_strdup(g_getenv("TMPDIR")); -+ } -+ -+#ifdef P_tmpdir -+ if (tmp == NULL || *tmp == '\0') { -+ gsize k; -+ g_free(tmp); -+ tmp = g_strdup(P_tmpdir); -+ k = strlen(tmp); -+ if (k > 1 && G_IS_DIR_SEPARATOR(tmp[k - 1])) -+ tmp[k - 1] = '\0'; -+ } -+#endif /* P_tmpdir */ -+ -+ if (tmp == NULL || *tmp == '\0') { -+ g_free(tmp); -+ tmp = g_strdup("/var/tmp"); -+ } -+ -+ g_once_init_leave(&tmp_dir, tmp); -+ } -+ -+ return tmp_dir; -+} -diff --git a/wsutil/wstmpdir.h b/wsutil/wstmpdir.h -new file mode 100644 -index 0000000..021b615 ---- /dev/null -+++ b/wsutil/wstmpdir.h -@@ -0,0 +1,39 @@ -+/* wstmpdir.c -+ * -+ * Copyright (C) 2013 Red Hat, Inc. All right reserved. -+ * -+ * Temporary directory routine -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2 -+ * of the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Author: Peter Hatina -+ */ -+ -+#ifndef __WS_TMP_DIR_H__ -+#define __WS_TMP_DIR_H__ -+ -+#include "ws_symbol_export.h" -+ -+#ifdef __cplusplus -+extern "C" { -+#endif // __cplusplus -+ -+WS_DLL_PUBLIC const char *get_tmp_dir(void); -+ -+#ifdef __cplusplus -+} -+#endif // __cplusplus -+ -+#endif // __WS_TMP_DIR_H__ diff --git a/wireshark-0013-Added-basic-conversation-support.patch b/wireshark-0013-Added-basic-conversation-support.patch new file mode 100644 index 0000000..15efb77 --- /dev/null +++ b/wireshark-0013-Added-basic-conversation-support.patch @@ -0,0 +1,178 @@ +From ce5c6e5de39f4af8b76dad77d2c237064e0930eb Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Tue, 1 Oct 2013 13:35:57 +0400 +Subject: [PATCH 13/13] Added basic conversation support + +Loosely based on a work done by Pascal Quantin (see +svn rev. 52306). + +This was backported from master. See this link for the original patch: + +https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9211 + +Signed-off-by: Peter Lemenkov +--- + epan/dissectors/packet-rtpproxy.c | 84 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 84 insertions(+) + +diff --git a/epan/dissectors/packet-rtpproxy.c b/epan/dissectors/packet-rtpproxy.c +index 7148d58..9f271b1 100644 +--- a/epan/dissectors/packet-rtpproxy.c ++++ b/epan/dissectors/packet-rtpproxy.c +@@ -32,6 +32,7 @@ + + #include + #include ++#include + + static int proto_rtpproxy = -1; + +@@ -60,6 +61,19 @@ static int hf_rtpproxy_reply = -1; + static int hf_rtpproxy_version_request = -1; + static int hf_rtpproxy_version_supported = -1; + ++/* Request/response tracking */ ++static int hf_rtpproxy_request_in = -1; ++static int hf_rtpproxy_response_in = -1; ++ ++typedef struct _rtpproxy_info { ++ guint32 req_frame; ++ guint32 resp_frame; ++} rtpproxy_info_t; ++ ++typedef struct _rtpproxy_conv_info { ++ emem_tree_t *trans; ++} rtpproxy_conv_info_t; ++ + static const value_string commandtypenames[] = { + { 'V', "Handshake/Ping" }, + { 'v', "Handshake/Ping" }, +@@ -150,6 +164,33 @@ rtpptoxy_add_tag(proto_tree *rtpproxy_tree, tvbuff_t *tvb, guint begin, guint re + return (end == realsize ? -1 : (gint)end); + } + ++void ++rtpproxy_add_tid(gboolean is_request, tvbuff_t *tvb, packet_info *pinfo, proto_tree *rtpproxy_tree, rtpproxy_conv_info_t *rtpproxy_conv, gchar* cookie) ++{ ++ rtpproxy_info_t *rtpproxy_info; ++ proto_item *pi; ++ ++ if (!PINFO_FD_VISITED(pinfo)) { ++ if (is_request){ ++ rtpproxy_info = se_new(rtpproxy_info_t); ++ rtpproxy_info->req_frame = PINFO_FD_NUM(pinfo); ++ rtpproxy_info->resp_frame = 0; ++ se_tree_insert_string(rtpproxy_conv->trans, cookie, rtpproxy_info, 0); ++ } else { ++ rtpproxy_info = (rtpproxy_info_t *)se_tree_lookup_string(rtpproxy_conv->trans, cookie, 0); ++ if (rtpproxy_info) { ++ rtpproxy_info->resp_frame = PINFO_FD_NUM(pinfo); ++ } ++ } ++ } else { ++ rtpproxy_info = (rtpproxy_info_t *)se_tree_lookup_string(rtpproxy_conv->trans, cookie, 0); ++ if (rtpproxy_info && (is_request ? rtpproxy_info->resp_frame : rtpproxy_info->req_frame)) { ++ pi = proto_tree_add_uint(rtpproxy_tree, is_request ? hf_rtpproxy_response_in : hf_rtpproxy_request_in, tvb, 0, 0, is_request ? rtpproxy_info->resp_frame : rtpproxy_info->req_frame); ++ PROTO_ITEM_SET_GENERATED(pi); ++ } ++ } ++} ++ + static void + dissect_rtpproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) + { +@@ -161,6 +202,9 @@ dissect_rtpproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) + guint8* rawstr; + proto_item *ti; + proto_tree *rtpproxy_tree; ++ conversation_t *conversation; ++ rtpproxy_conv_info_t *rtpproxy_conv; ++ gchar* cookie = NULL; + + /* Clear out stuff in the info column - we''l set it later */ + col_clear(pinfo->cinfo, COL_INFO); +@@ -171,6 +215,7 @@ dissect_rtpproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) + /* Extract Cookie */ + offset = tvb_find_guint8(tvb, offset, -1, ' '); + proto_tree_add_item(rtpproxy_tree, hf_rtpproxy_cookie, tvb, 0, offset, ENC_ASCII | ENC_NA); ++ cookie = tvb_get_ephemeral_string(tvb, 0, offset); + + /* Skip whitespace */ + offset = tvb_skip_wsp(tvb, offset+1, -1); +@@ -188,6 +233,15 @@ dissect_rtpproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) + else + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTPproxy (no LF)"); + ++ /* Try to create conversation */ ++ conversation = find_or_create_conversation(pinfo); ++ rtpproxy_conv = (rtpproxy_conv_info_t *)conversation_get_proto_data(conversation, proto_rtpproxy); ++ if (!rtpproxy_conv) { ++ rtpproxy_conv = se_new(rtpproxy_conv_info_t); ++ rtpproxy_conv->trans = se_tree_create_non_persistent(EMEM_TREE_TYPE_RED_BLACK, "rtpproxy transactions");; ++ conversation_add_proto_data(conversation, proto_rtpproxy, rtpproxy_conv); ++ } ++ + /* Get payload string */ + rawstr = tvb_get_ephemeral_string(tvb, offset, realsize - offset); + +@@ -198,6 +252,7 @@ dissect_rtpproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) + case 's': + /* A specific case - long statistics answer */ + /* %COOKIE% sessions created %NUM0% active sessions: %NUM1% */ ++ rtpproxy_add_tid(FALSE, tvb, pinfo, rtpproxy_tree, rtpproxy_conv, cookie); + if ('e' == tvb_get_guint8(tvb, offset+1)){ + col_add_fstr(pinfo->cinfo, COL_INFO, "Reply: %s", rawstr); + ti = proto_tree_add_item(rtpproxy_tree, hf_rtpproxy_reply, tvb, offset, -1, ENC_NA); +@@ -216,6 +271,7 @@ dissect_rtpproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) + case 'r': + case 'c': + case 'q': ++ rtpproxy_add_tid(TRUE, tvb, pinfo, rtpproxy_tree, rtpproxy_conv, cookie); + col_add_fstr(pinfo->cinfo, COL_INFO, "Request: %s", rawstr); + ti = proto_tree_add_item(rtpproxy_tree, hf_rtpproxy_request, tvb, offset, -1, ENC_NA); + rtpproxy_tree = proto_item_add_subtree(ti, ett_rtpproxy_request); +@@ -358,6 +414,7 @@ dissect_rtpproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) + case '7': + case '8': + case '9': ++ rtpproxy_add_tid(FALSE, tvb, pinfo, rtpproxy_tree, rtpproxy_conv, cookie); + if (tmp == 'e') + col_add_fstr(pinfo->cinfo, COL_INFO, "Error reply: %s", rawstr); + else +@@ -728,6 +785,33 @@ proto_register_rtpproxy(void) + HFILL + } + }, ++ { ++ &hf_rtpproxy_request_in, ++ { ++ "Request In", ++ "rtpproxy.request_in", ++ FT_FRAMENUM, ++ BASE_NONE, ++ NULL, ++ 0x0, ++ NULL, ++ HFILL ++ } ++ ++ }, ++ { ++ &hf_rtpproxy_response_in, ++ { ++ "Response In", ++ "rtpproxy.response_in", ++ FT_FRAMENUM, ++ BASE_NONE, ++ NULL, ++ 0x0, ++ NULL, ++ HFILL ++ } ++ } + }; + + /* Setup protocol subtree array */ +-- +1.8.3.1 + diff --git a/wireshark-0013-Manual-backport-of-r52142-and-r52144-to-fix-collisio.patch b/wireshark-0013-Manual-backport-of-r52142-and-r52144-to-fix-collisio.patch deleted file mode 100644 index 87d0caa..0000000 --- a/wireshark-0013-Manual-backport-of-r52142-and-r52144-to-fix-collisio.patch +++ /dev/null @@ -1,73 +0,0 @@ -From fc0f3e37918f727956df096fc301a0e62926c1c0 Mon Sep 17 00:00:00 2001 -From: Evan Huus -Date: Sun, 22 Sep 2013 16:42:21 +0000 -Subject: [PATCH 13/14] Manual backport of r52142 and r52144 to fix collision - between gluster defines and system header dirent.h - -svn path=/trunk-1.10/; revision=52173 ---- - epan/dissectors/packet-gluster.h | 18 +++++++++--------- - epan/dissectors/packet-glusterfs.c | 18 +++++++++--------- - 2 files changed, 18 insertions(+), 18 deletions(-) - -diff --git a/epan/dissectors/packet-gluster.h b/epan/dissectors/packet-gluster.h -index e3c43d1..fc69e6c 100644 ---- a/epan/dissectors/packet-gluster.h -+++ b/epan/dissectors/packet-gluster.h -@@ -356,15 +356,15 @@ enum gf_fop_procnum { - - /* dir-entry types from libglusterfs/src/compat.h */ - enum gluster_entry_types { -- DT_UNKNOWN = 0, -- DT_FIFO = 1, -- DT_CHR = 2, -- DT_DIR = 4, -- DT_BLK = 6, -- DT_REG = 8, -- DT_LNK = 10, -- DT_SOCK = 12, -- DT_WHT = 14 -+ GLUSTER_DT_UNKNOWN = 0, -+ GLUSTER_DT_FIFO = 1, -+ GLUSTER_DT_CHR = 2, -+ GLUSTER_DT_DIR = 4, -+ GLUSTER_DT_BLK = 6, -+ GLUSTER_DT_REG = 8, -+ GLUSTER_DT_LNK = 10, -+ GLUSTER_DT_SOCK = 12, -+ GLUSTER_DT_WHT = 14 - }; - - -diff --git a/epan/dissectors/packet-glusterfs.c b/epan/dissectors/packet-glusterfs.c -index 56f9093..29ff0dc 100644 ---- a/epan/dissectors/packet-glusterfs.c -+++ b/epan/dissectors/packet-glusterfs.c -@@ -2002,15 +2002,15 @@ static value_string_ext glusterfs3_1_fop_proc_vals_ext = VALUE_STRING_EXT_INIT(g - - /* dir-entry types */ - static const value_string glusterfs_entry_type_names[] = { -- { DT_UNKNOWN, "DT_UNKNOWN" }, -- { DT_FIFO, "DT_FIFO" }, -- { DT_CHR, "DT_CHR" }, -- { DT_DIR, "DT_DIR" }, -- { DT_BLK, "DT_BLK" }, -- { DT_REG, "DT_REG" }, -- { DT_LNK, "DT_LNK" }, -- { DT_SOCK, "DT_SOCK" }, -- { DT_WHT, "DT_WHT" }, -+ { GLUSTER_DT_UNKNOWN, "DT_UNKNOWN" }, -+ { GLUSTER_DT_FIFO, "DT_FIFO" }, -+ { GLUSTER_DT_CHR, "DT_CHR" }, -+ { GLUSTER_DT_DIR, "DT_DIR" }, -+ { GLUSTER_DT_BLK, "DT_BLK" }, -+ { GLUSTER_DT_REG, "DT_REG" }, -+ { GLUSTER_DT_LNK, "DT_LNK" }, -+ { GLUSTER_DT_SOCK, "DT_SOCK" }, -+ { GLUSTER_DT_WHT, "DT_WHT" }, - { 0, NULL } - }; - static value_string_ext glusterfs_entry_type_names_ext = VALUE_STRING_EXT_INIT(glusterfs_entry_type_names); --- -1.8.3.1 - diff --git a/wireshark-0014-Added-basic-conversation-support.patch b/wireshark-0014-Added-basic-conversation-support.patch deleted file mode 100644 index 2402e71..0000000 --- a/wireshark-0014-Added-basic-conversation-support.patch +++ /dev/null @@ -1,178 +0,0 @@ -From af2f5b8cf5af44ab721ff55b3fd826d3067fe3b4 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Tue, 1 Oct 2013 13:35:57 +0400 -Subject: [PATCH 14/14] Added basic conversation support - -Loosely based on a work done by Pascal Quantin (see -svn rev. 52306). - -This was backported from master. See this link for the original patch: - -https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9211 - -Signed-off-by: Peter Lemenkov ---- - epan/dissectors/packet-rtpproxy.c | 84 +++++++++++++++++++++++++++++++++++++++ - 1 file changed, 84 insertions(+) - -diff --git a/epan/dissectors/packet-rtpproxy.c b/epan/dissectors/packet-rtpproxy.c -index 7148d58..9f271b1 100644 ---- a/epan/dissectors/packet-rtpproxy.c -+++ b/epan/dissectors/packet-rtpproxy.c -@@ -32,6 +32,7 @@ - - #include - #include -+#include - - static int proto_rtpproxy = -1; - -@@ -60,6 +61,19 @@ static int hf_rtpproxy_reply = -1; - static int hf_rtpproxy_version_request = -1; - static int hf_rtpproxy_version_supported = -1; - -+/* Request/response tracking */ -+static int hf_rtpproxy_request_in = -1; -+static int hf_rtpproxy_response_in = -1; -+ -+typedef struct _rtpproxy_info { -+ guint32 req_frame; -+ guint32 resp_frame; -+} rtpproxy_info_t; -+ -+typedef struct _rtpproxy_conv_info { -+ emem_tree_t *trans; -+} rtpproxy_conv_info_t; -+ - static const value_string commandtypenames[] = { - { 'V', "Handshake/Ping" }, - { 'v', "Handshake/Ping" }, -@@ -150,6 +164,33 @@ rtpptoxy_add_tag(proto_tree *rtpproxy_tree, tvbuff_t *tvb, guint begin, guint re - return (end == realsize ? -1 : (gint)end); - } - -+void -+rtpproxy_add_tid(gboolean is_request, tvbuff_t *tvb, packet_info *pinfo, proto_tree *rtpproxy_tree, rtpproxy_conv_info_t *rtpproxy_conv, gchar* cookie) -+{ -+ rtpproxy_info_t *rtpproxy_info; -+ proto_item *pi; -+ -+ if (!PINFO_FD_VISITED(pinfo)) { -+ if (is_request){ -+ rtpproxy_info = se_new(rtpproxy_info_t); -+ rtpproxy_info->req_frame = PINFO_FD_NUM(pinfo); -+ rtpproxy_info->resp_frame = 0; -+ se_tree_insert_string(rtpproxy_conv->trans, cookie, rtpproxy_info, 0); -+ } else { -+ rtpproxy_info = (rtpproxy_info_t *)se_tree_lookup_string(rtpproxy_conv->trans, cookie, 0); -+ if (rtpproxy_info) { -+ rtpproxy_info->resp_frame = PINFO_FD_NUM(pinfo); -+ } -+ } -+ } else { -+ rtpproxy_info = (rtpproxy_info_t *)se_tree_lookup_string(rtpproxy_conv->trans, cookie, 0); -+ if (rtpproxy_info && (is_request ? rtpproxy_info->resp_frame : rtpproxy_info->req_frame)) { -+ pi = proto_tree_add_uint(rtpproxy_tree, is_request ? hf_rtpproxy_response_in : hf_rtpproxy_request_in, tvb, 0, 0, is_request ? rtpproxy_info->resp_frame : rtpproxy_info->req_frame); -+ PROTO_ITEM_SET_GENERATED(pi); -+ } -+ } -+} -+ - static void - dissect_rtpproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) - { -@@ -161,6 +202,9 @@ dissect_rtpproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) - guint8* rawstr; - proto_item *ti; - proto_tree *rtpproxy_tree; -+ conversation_t *conversation; -+ rtpproxy_conv_info_t *rtpproxy_conv; -+ gchar* cookie = NULL; - - /* Clear out stuff in the info column - we''l set it later */ - col_clear(pinfo->cinfo, COL_INFO); -@@ -171,6 +215,7 @@ dissect_rtpproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) - /* Extract Cookie */ - offset = tvb_find_guint8(tvb, offset, -1, ' '); - proto_tree_add_item(rtpproxy_tree, hf_rtpproxy_cookie, tvb, 0, offset, ENC_ASCII | ENC_NA); -+ cookie = tvb_get_ephemeral_string(tvb, 0, offset); - - /* Skip whitespace */ - offset = tvb_skip_wsp(tvb, offset+1, -1); -@@ -188,6 +233,15 @@ dissect_rtpproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) - else - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTPproxy (no LF)"); - -+ /* Try to create conversation */ -+ conversation = find_or_create_conversation(pinfo); -+ rtpproxy_conv = (rtpproxy_conv_info_t *)conversation_get_proto_data(conversation, proto_rtpproxy); -+ if (!rtpproxy_conv) { -+ rtpproxy_conv = se_new(rtpproxy_conv_info_t); -+ rtpproxy_conv->trans = se_tree_create_non_persistent(EMEM_TREE_TYPE_RED_BLACK, "rtpproxy transactions");; -+ conversation_add_proto_data(conversation, proto_rtpproxy, rtpproxy_conv); -+ } -+ - /* Get payload string */ - rawstr = tvb_get_ephemeral_string(tvb, offset, realsize - offset); - -@@ -198,6 +252,7 @@ dissect_rtpproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) - case 's': - /* A specific case - long statistics answer */ - /* %COOKIE% sessions created %NUM0% active sessions: %NUM1% */ -+ rtpproxy_add_tid(FALSE, tvb, pinfo, rtpproxy_tree, rtpproxy_conv, cookie); - if ('e' == tvb_get_guint8(tvb, offset+1)){ - col_add_fstr(pinfo->cinfo, COL_INFO, "Reply: %s", rawstr); - ti = proto_tree_add_item(rtpproxy_tree, hf_rtpproxy_reply, tvb, offset, -1, ENC_NA); -@@ -216,6 +271,7 @@ dissect_rtpproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) - case 'r': - case 'c': - case 'q': -+ rtpproxy_add_tid(TRUE, tvb, pinfo, rtpproxy_tree, rtpproxy_conv, cookie); - col_add_fstr(pinfo->cinfo, COL_INFO, "Request: %s", rawstr); - ti = proto_tree_add_item(rtpproxy_tree, hf_rtpproxy_request, tvb, offset, -1, ENC_NA); - rtpproxy_tree = proto_item_add_subtree(ti, ett_rtpproxy_request); -@@ -358,6 +414,7 @@ dissect_rtpproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) - case '7': - case '8': - case '9': -+ rtpproxy_add_tid(FALSE, tvb, pinfo, rtpproxy_tree, rtpproxy_conv, cookie); - if (tmp == 'e') - col_add_fstr(pinfo->cinfo, COL_INFO, "Error reply: %s", rawstr); - else -@@ -728,6 +785,33 @@ proto_register_rtpproxy(void) - HFILL - } - }, -+ { -+ &hf_rtpproxy_request_in, -+ { -+ "Request In", -+ "rtpproxy.request_in", -+ FT_FRAMENUM, -+ BASE_NONE, -+ NULL, -+ 0x0, -+ NULL, -+ HFILL -+ } -+ -+ }, -+ { -+ &hf_rtpproxy_response_in, -+ { -+ "Response In", -+ "rtpproxy.response_in", -+ FT_FRAMENUM, -+ BASE_NONE, -+ NULL, -+ 0x0, -+ NULL, -+ HFILL -+ } -+ } - }; - - /* Setup protocol subtree array */ --- -1.8.3.1 - diff --git a/wireshark.spec b/wireshark.spec index 2c0f54d..fd48003 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -20,8 +20,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 1.10.2 -Release: 8%{?dist} +Version: 1.10.3 +Release: 1%{?dist} License: GPL+ Group: Applications/Internet Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2 @@ -46,12 +46,10 @@ Patch10: wireshark-0010-Add-pkgconfig-entry.patch # Will be proposed upstream Patch11: wireshark-0011-Install-autoconf-related-file.patch # Fedora-specific -Patch12: wireshark-0012-tmp-dir.patch -# Backported from upstream. See also https://bugzilla.redhat.com/1007139 -Patch13: wireshark-0013-Manual-backport-of-r52142-and-r52144-to-fix-collisio.patch -# Backported to 1.10.0 from the patch from this ticket: +Patch12: wireshark-0012-move-default-temporary-directory-to-var-tmp.patch +# Backported to 1.10.x from the patch from this ticket: # https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9211 -Patch14: wireshark-0014-Added-basic-conversation-support.patch +Patch13: wireshark-0013-Added-basic-conversation-support.patch Url: http://www.wireshark.org/ BuildRequires: libpcap-devel >= 0.9 @@ -158,8 +156,7 @@ and plugins. %patch10 -p1 -b .add_pkgconfig %patch11 -p1 -b .install_autoconf %patch12 -p1 -b .tmp_dir -%patch13 -p1 -b .dirent_clash -%patch14 -p1 -b .rtpproxy_conversations +%patch13 -p1 -b .rtpproxy_conversations %build %ifarch s390 s390x sparcv9 sparc64 @@ -354,7 +351,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/aclocal/* %changelog -* Tue Oct 01 2013 Peter Lemenkov - 1.10.0-8 +* Sat Nov 02 2013 Peter Lemenkov - 1.10.3-1 +- Ver. 1.10.3 +- Dropped upsteamed patch no. 13 + +* Tue Oct 01 2013 Peter Lemenkov - 1.10.2-8 - Added support for rtpproxy conversations (req/resp matching) * Tue Sep 24 2013 Peter Hatina - 1.10.2-7