diff options
Diffstat (limited to 'pjlib-util')
-rw-r--r-- | pjlib-util/build/pjlib_util.dsp | 8 | ||||
-rw-r--r-- | pjlib-util/build/pjstun_client.dsp | 8 | ||||
-rw-r--r-- | pjlib-util/include/pjlib-util.h | 1 | ||||
-rw-r--r-- | pjlib-util/include/pjlib-util/stun_session.h (renamed from pjlib-util/src/pjstun-client/stun_session.h) | 0 | ||||
-rw-r--r-- | pjlib-util/src/pjlib-util/stun_session.c (renamed from pjlib-util/src/pjstun-client/stun_session.c) | 5 | ||||
-rw-r--r-- | pjlib-util/src/pjstun-client/client_main.c | 1 |
6 files changed, 12 insertions, 11 deletions
diff --git a/pjlib-util/build/pjlib_util.dsp b/pjlib-util/build/pjlib_util.dsp index 555a6c15..6aa10d11 100644 --- a/pjlib-util/build/pjlib_util.dsp +++ b/pjlib-util/build/pjlib_util.dsp @@ -161,6 +161,10 @@ SOURCE="..\src\pjlib-util\stun_server.c" # End Source File
# Begin Source File
+SOURCE="..\src\pjlib-util\stun_session.c"
+# End Source File
+# Begin Source File
+
SOURCE="..\src\pjlib-util\stun_simple.c"
# End Source File
# Begin Source File
@@ -261,6 +265,10 @@ SOURCE="..\include\pjlib-util\stun_server.h" # End Source File
# Begin Source File
+SOURCE="..\include\pjlib-util\stun_session.h"
+# End Source File
+# Begin Source File
+
SOURCE="..\include\pjlib-util\stun_simple.h"
# End Source File
# Begin Source File
diff --git a/pjlib-util/build/pjstun_client.dsp b/pjlib-util/build/pjstun_client.dsp index b4cbdb3a..2d5705b7 100644 --- a/pjlib-util/build/pjstun_client.dsp +++ b/pjlib-util/build/pjstun_client.dsp @@ -89,18 +89,10 @@ LINK32=link.exe SOURCE="..\src\pjstun-client\client_main.c"
# End Source File
-# Begin Source File
-
-SOURCE="..\src\pjstun-client\stun_session.c"
-# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE="..\src\pjstun-client\stun_session.h"
-# End Source File
# End Group
# Begin Group "Resource Files"
diff --git a/pjlib-util/include/pjlib-util.h b/pjlib-util/include/pjlib-util.h index 2b3326b4..7c8e2ad4 100644 --- a/pjlib-util/include/pjlib-util.h +++ b/pjlib-util/include/pjlib-util.h @@ -52,6 +52,7 @@ #include <pjlib-util/stun_endpoint.h> #include <pjlib-util/stun_msg.h> #include <pjlib-util/stun_server.h> +#include <pjlib-util/stun_session.h> #include <pjlib-util/stun_transaction.h> /* Old STUN */ diff --git a/pjlib-util/src/pjstun-client/stun_session.h b/pjlib-util/include/pjlib-util/stun_session.h index 057b35aa..057b35aa 100644 --- a/pjlib-util/src/pjstun-client/stun_session.h +++ b/pjlib-util/include/pjlib-util/stun_session.h diff --git a/pjlib-util/src/pjstun-client/stun_session.c b/pjlib-util/src/pjlib-util/stun_session.c index 03dc6f19..ce15a610 100644 --- a/pjlib-util/src/pjstun-client/stun_session.c +++ b/pjlib-util/src/pjlib-util/stun_session.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "stun_session.h" +#include <pjlib-util/stun_session.h> #include <pjlib.h> struct pj_stun_session @@ -90,6 +90,7 @@ static pj_status_t tsx_add(pj_stun_session *sess, static pj_status_t tsx_erase(pj_stun_session *sess, pj_stun_tx_data *tdata) { + PJ_UNUSED_ARG(sess); pj_list_erase(tdata); return PJ_SUCCESS; } @@ -130,7 +131,7 @@ static pj_status_t create_tdata(pj_stun_session *sess, tdata = PJ_POOL_ZALLOC_TYPE(pool, pj_stun_tx_data); tdata->pool = pool; tdata->sess = sess; - tdata->user_data = tdata; + tdata->user_data = user_data; /* Create STUN message */ status = pj_stun_msg_create(pool, msg_type, PJ_STUN_MAGIC, diff --git a/pjlib-util/src/pjstun-client/client_main.c b/pjlib-util/src/pjstun-client/client_main.c index 5f9d7d4c..4ef95d85 100644 --- a/pjlib-util/src/pjstun-client/client_main.c +++ b/pjlib-util/src/pjstun-client/client_main.c @@ -18,7 +18,6 @@ */ #include <pjlib-util.h> #include <pjlib.h> -#include "stun_session.h" #include <conio.h> |