move stun to the core

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1038 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/libdingaling/libdingaling.vcproj b/libs/libdingaling/libdingaling.vcproj
index 33fc3b5bea815fd84efcac96ae026866c998ed9c..f20b263bc7b6178355dca11fe47775cfb2f4177a 100644 (file)
--- a/libs/libdingaling/libdingaling.vcproj
+++ b/libs/libdingaling/libdingaling.vcproj
@@ -304,10 +304,6 @@
                                RelativePath=".\src\libdingaling.c"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath=".\src\stun_parser.c"\r
-                               >\r
-                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="Header Files"\r
@@ -322,10 +318,6 @@
                                RelativePath=".\src\libdingaling.h"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath=".\src\stun_parser.h"\r
-                               >\r
-                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="Resource Files"\r

diff --git a/libs/libdingaling/src/dingaling.def b/libs/libdingaling/src/dingaling.def
index 69a3b6ea1e429dec9a79f0c6d02b32074af68628..18de3e5d528061ef17f110842112ef3c60c91c3c 100644 (file)
--- a/libs/libdingaling/src/dingaling.def
+++ b/libs/libdingaling/src/dingaling.def
@@ -1,12 +1,4 @@
 EXPORTS
-stun_random_string
-stun_packet_parse
-stun_value_to_name
-stun_packet_attribute_get_mapped_address
-stun_packet_attribute_get_username
-stun_packet_build_header
-stun_packet_attribute_add_username
-stun_packet_attribute_add_binded_address
 ldl_session_get_caller
 ldl_session_get_ip
 ldl_session_set_private

diff --git a/src/include/switch_stun.h b/src/include/switch_stun.h
index 2aaf587d3e245f1c9101a6bdb6e7753883bccd85..4deae6bc2663209f9d5136a76f73c2d2029c6f49 100644 (file)
--- a/src/include/switch_stun.h
+++ b/src/include/switch_stun.h
@@ -143,7 +143,7 @@ SWITCH_DECLARE(switch_stun_packet_t *)switch_stun_packet_parse(uint8_t *buf, uin
   \param value the value to look up
   \return a sring version of value
 */
-SWITCH_DECLARE(const char *)switch_stun_value_to_name(int32_t type, int32_t value);
+SWITCH_DECLARE(const char *)switch_stun_value_to_name(int32_t type, uint32_t value);
 
 
 /*!

diff --git a/src/switch_stun.c b/src/switch_stun.c
index c7850d2484b2f57661bb5f5224a66d3be24b0bdb..e640838fb33efdf34c1e21b0ebd9e9170b402fde 100644 (file)
--- a/src/switch_stun.c
+++ b/src/switch_stun.c
@@ -141,7 +141,7 @@ SWITCH_DECLARE(switch_stun_packet_t *)switch_stun_packet_parse(uint8_t *buf, uin
        return packet;
 }
 
-SWITCH_DECLARE(const char *)switch_stun_value_to_name(int32_t type, int32_t value)
+SWITCH_DECLARE(const char *)switch_stun_value_to_name(int32_t type, uint32_t value)
 
 {
        uint32_t x = 0;
@@ -235,7 +235,7 @@ SWITCH_DECLARE(uint8_t) switch_stun_packet_attribute_add_binded_address(switch_s
        i = (uint8_t *) &ip->address;
 
        for(x = 0; x < 4 ; x++) {
-               i[x] = atoi(p);
+               i[x] = (uint8_t)atoi(p);
                if ((p = strchr(p, '.'))) {
                        p++;
                } else {

diff --git a/w32/vsnet/FreeSwitchCore.vcproj b/w32/vsnet/FreeSwitchCore.vcproj
index 5b697218479b4feac6073fa8c1fa659f5cf69db9..b50cf42b624c4dde85032a0994258e1b0e6a45f1 100644 (file)
--- a/w32/vsnet/FreeSwitchCore.vcproj
+++ b/w32/vsnet/FreeSwitchCore.vcproj
@@ -239,6 +239,10 @@
                                RelativePath="..\..\src\switch_rtp.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\switch_stun.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\switch_utils.c"\r
                                >\r
@@ -317,6 +321,10 @@
                                RelativePath="..\..\src\include\switch_sqlite.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\include\switch_stun.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\include\switch_types.h"\r
                                >\r

diff --git a/w32/vsnet/GetLibs.vbs b/w32/vsnet/GetLibs.vbs
index 25ed7ae498c76383e966d75d0b2b58fbd47cb7d2..9c7fd1385507807f5f93c1225b5d8da05addee8d 100644 (file)
--- a/w32/vsnet/GetLibs.vbs
+++ b/w32/vsnet/GetLibs.vbs
@@ -178,7 +178,6 @@ End If
 \r
 If BuildModDingaling Then\r
        BuildLibs_iksemel BuildDebug, BuildRelease\r
-       BuildLibs_jrtplib BuildDebug, BuildRelease\r
 End If\r
 \r
 If BuildModIaxChan Then\r