Got rid of some errors but 1 remains:

libui.lib(camel_srt.obj) : error LNK2001: unresolved external symbol _camelSRTt
pe_naming
wireshark.exe : fatal error LNK1120: 1 unresolved externals
NMAKE : fatal error U1077: 'link' : return code '0x460'
Stop.

svn path=/trunk/; revision=19424

diff --git a/epan/camel-persistentdata.c b/epan/camel-persistentdata.c
index ff3c06be7bce4d749cf4f67bbb187dd40cf59f6f..34634c8cea85ee2ddec9d08dbdebdfd681c98261 100644 (file)
--- a/epan/camel-persistentdata.c
+++ b/epan/camel-persistentdata.c
@@ -38,6 +38,19 @@
 #include "epan/dissectors/packet-tcap.h"
 #include "epan/dissectors/packet-mtp3.h"
 
+const value_string  camelSRTtype_naming[]= {
+  { CAMELSRT_SESSION,         "TCAP_Session" },
+  { CAMELSRT_VOICE_INITIALDP, "InialDP/Continue" },
+  { CAMELSRT_VOICE_ACR1,      "Slice1_ACR/ACH" }, 
+  { CAMELSRT_VOICE_ACR2,      "Slice2_ACR/ACH" },
+  { CAMELSRT_VOICE_ACR3,      "Slice3_ACR/ACH" },
+  { CAMELSRT_VOICE_DISC,      "EvtRepBSCM/Release" },
+  { CAMELSRT_SMS_INITIALDP,   "InitialDP/ContinueSMS" },
+  { CAMELSRT_GPRS_INITIALDP,  "InitialDP/ContinueGPRS" },
+  { CAMELSRT_GPRS_REPORT,     "EvtRepGPRS/ContinueGPRS" },
+  { 0,NULL}
+};
+
 static gint camelsrt_call_equal(gconstpointer k1, gconstpointer k2);
 static guint camelsrt_call_hash(gconstpointer k);
 static struct camelsrt_call_t * find_camelsrt_call(struct camelsrt_call_info_key_t * p_camelsrt_call_key,

diff --git a/epan/camel-persistentdata.h b/epan/camel-persistentdata.h
index 44147882dcb1cd612566fb18b5fbe41eb1e4d3fb..518766f52c43c7f40db7f7b7d16a83b8d1a1c676 100644 (file)
--- a/epan/camel-persistentdata.h
+++ b/epan/camel-persistentdata.h
@@ -48,18 +48,7 @@
 \r
 #define CAMELSRT_SMS_INITIALDP 9\r
 \r
-static const value_string  camelSRTtype_naming[]= {\r
-  { CAMELSRT_SESSION,         "TCAP_Session" },\r
-  { CAMELSRT_VOICE_INITIALDP, "InialDP/Continue" },\r
-  { CAMELSRT_VOICE_ACR1,      "Slice1_ACR/ACH" }, \r
-  { CAMELSRT_VOICE_ACR2,      "Slice2_ACR/ACH" },\r
-  { CAMELSRT_VOICE_ACR3,      "Slice3_ACR/ACH" },\r
-  { CAMELSRT_VOICE_DISC,      "EvtRepBSCM/Release" },\r
-  { CAMELSRT_SMS_INITIALDP,   "InitialDP/ContinueSMS" },\r
-  { CAMELSRT_GPRS_INITIALDP,  "InitialDP/ContinueGPRS" },\r
-  { CAMELSRT_GPRS_REPORT,     "EvtRepGPRS/ContinueGPRS" },\r
-  { 0,NULL}\r
-};\r
+extern const value_string  camelSRTtype_naming[];\r
 \r
 /* If we have a request message and its response,\r
    (eg: ApplyCharging, ApplyChargingReport)\r

diff --git a/tap-camelsrt.c b/tap-camelsrt.c
index 25387022a70e10cc7a0d69163d6f7240ec1770a0..85b634a558ea5c5d2b07b7c263213c6ea7d69d4f 100644 (file)
--- a/tap-camelsrt.c
+++ b/tap-camelsrt.c
@@ -60,9 +60,11 @@ struct camelsrt_t {
   nstime_t delta_time[NB_CAMELSRT_CATEGORY][NUM_RAS_STATS];
 };
 
-/* Check if we have to inhibit the display or not */
-extern gboolean gcamel_StatSRT;
-extern gboolean gtcap_StatSRT;
+/* Check if we have to inhibit the display or not 
+ * cannot be static because it's exported in libwireshark.def
+ */
+gboolean gcamel_StatSRT;
+gboolean gtcap_StatSRT;
 
 /* Reset the counter */
 static void camelsrt_reset(void *phs)