From 0fe4db12d0dbb01c62f43213eddbbd692cd2beba Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Tue, 4 Apr 2006 16:50:35 +0000
Subject: [PATCH] move stun to the core

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1038 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 libs/libdingaling/libdingaling.vcproj | 8 --------
 libs/libdingaling/src/dingaling.def   | 8 --------
 src/include/switch_stun.h             | 2 +-
 src/switch_stun.c                     | 4 ++--
 w32/vsnet/FreeSwitchCore.vcproj       | 8 ++++++++
 w32/vsnet/GetLibs.vbs                 | 1 -
 6 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/libs/libdingaling/libdingaling.vcproj b/libs/libdingaling/libdingaling.vcproj
index 33fc3b5bea..f20b263bc7 100644
--- a/libs/libdingaling/libdingaling.vcproj
+++ b/libs/libdingaling/libdingaling.vcproj
@@ -304,10 +304,6 @@
 				RelativePath=".\src\libdingaling.c"
 				>
 			</File>
-			<File
-				RelativePath=".\src\stun_parser.c"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -322,10 +318,6 @@
 				RelativePath=".\src\libdingaling.h"
 				>
 			</File>
-			<File
-				RelativePath=".\src\stun_parser.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/libs/libdingaling/src/dingaling.def b/libs/libdingaling/src/dingaling.def
index 69a3b6ea1e..18de3e5d52 100644
--- 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 2aaf587d3e..4deae6bc26 100644
--- 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 c7850d2484..e640838fb3 100644
--- 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 5b69721847..b50cf42b62 100644
--- a/w32/vsnet/FreeSwitchCore.vcproj
+++ b/w32/vsnet/FreeSwitchCore.vcproj
@@ -239,6 +239,10 @@
 				RelativePath="..\..\src\switch_rtp.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\switch_stun.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\switch_utils.c"
 				>
@@ -317,6 +321,10 @@
 				RelativePath="..\..\src\include\switch_sqlite.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\include\switch_stun.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\include\switch_types.h"
 				>
diff --git a/w32/vsnet/GetLibs.vbs b/w32/vsnet/GetLibs.vbs
index 25ed7ae498..9c7fd13855 100644
--- a/w32/vsnet/GetLibs.vbs
+++ b/w32/vsnet/GetLibs.vbs
@@ -178,7 +178,6 @@ End If
 
 If BuildModDingaling Then
 	BuildLibs_iksemel BuildDebug, BuildRelease
-	BuildLibs_jrtplib BuildDebug, BuildRelease
 End If
 
 If BuildModIaxChan Then