Commit 7b10c356 authored by atraczyk's avatar atraczyk

contrib: add UWP support

Change-Id: I648876cae97267cbc2eac2343f5fcde6970a487f
Tuleap: #790
parent 9767c702
set BUILD=..\..\build
set SRC=..\..\src
mkdir %BUILD%
wget http://www.pjsip.org/release/2.5.5/pjproject-2.5.5.zip
unzip pjproject-2.5.5.zip -d ..\..\build
del pjproject-2.5.5.zip
rename ..\..\build\pjproject-2.5.5 pjproject
cd ..\..\build\pjproject
git apply --reject --whitespace=fix %SRC%\pjproject\intptr_t.patch
git apply --reject --whitespace=fix %SRC%\pjproject\pj_win.patch
git apply --reject --whitespace=fix %SRC%\pjproject\endianness.patch
git apply --reject --whitespace=fix %SRC%\pjproject\gnutls.patch
git apply --reject --whitespace=fix %SRC%\pjproject\notestsapps.patch
git apply --reject --whitespace=fix %SRC%\pjproject\ipv6.patch
git apply --reject --whitespace=fix %SRC%\pjproject\ice_config.patch
git apply --reject --whitespace=fix %SRC%\pjproject\multiple_listeners.patch
git apply --reject --whitespace=fix %SRC%\pjproject\fix_turn_fallback.patch
git apply --reject --whitespace=fix %SRC%\pjproject\fix_ioqueue_ipv6_sendto.patch
git apply --reject --whitespace=fix %SRC%\pjproject\add_dtls_transport.patch
git apply --reject --whitespace=fix %SRC%\pjproject\pj_uwp.patch
git apply --reject --whitespace=fix %SRC%\pjproject\pj_uwp_ice_sess.patch
git apply --reject --whitespace=fix %SRC%\pjproject\pj_uwp_xbox_one.patch
cd %SRC%
\ No newline at end of file
......@@ -504,7 +504,7 @@ index 0000000..37bcaba
+#include <pj/timer.h>
+#include <pj/file_io.h>
+
+#if GNUTLS_VERSION_NUMBER < 0x030306
+#if GNUTLS_VERSION_NUMBER < 0x030306 && !defined(_MSC_VER)
+#include <dirent.h>
+#endif
+
......@@ -535,7 +535,7 @@ index 0000000..37bcaba
+#include <gnutls/abstract.h>
+
+#ifdef _MSC_VER
+# pragma comment( lib, "gnutls")
+# pragma comment( lib, "libgnutls")
+#endif
+
+
......@@ -2134,7 +2134,7 @@ index 0000000..37bcaba
+ /* Decrypt received data using GnuTLS (will read our input
+ * circular buffer) */
+ int decrypted_size = gnutls_record_recv(ssock->session,
+ app_read_data->data +
+ ((read_data_t *)app_read_data->data) +
+ app_read_data->len,
+ app_data_size);
+
......@@ -2940,7 +2940,7 @@ index 0000000..37bcaba
+ * (or fails in a fatal way). */
+ while (total_written < size) {
+ /* Try encrypting using GnuTLS */
+ nwritten = gnutls_record_send(ssock->session, data + total_written,
+ nwritten = gnutls_record_send(ssock->session, ((read_data_t *)data) + total_written,
+ size);
+
+ if (nwritten > 0) {
......
......@@ -19,4 +19,5 @@
#ifndef PJ_ICE_MAX_CHECKS
-# define PJ_ICE_MAX_CHECKS 32
+# define PJ_ICE_MAX_CHECKS 150
#endif
\ No newline at end of file
#endif
\ No newline at end of file
This diff is collapsed.
--- a/pjnath/include/pjnath/ice_strans.h
+++ b/pjnath/include/pjnath/ice_strans.h
@@ -930,6 +930,7 @@
int dst_addr_len);
+PJ_DECL(pj_ice_sess *) pj_ice_strans_get_ice_sess(pj_ice_strans *ice_st);
/**
* @}
*/
--- a/pjnath/src/pjnath/ice_strans.c
+++ b/pjnath/src/pjnath/ice_strans.c
@@ -1465,6 +1468,11 @@
return PJ_EINVALIDOP;
}
+PJ_DECL(pj_ice_sess *) pj_ice_strans_get_ice_sess( pj_ice_strans *ice_st )
+{
+ return ice_st->ice;
+}
+
/*
* Callback called by ICE session when ICE processing is complete, either
* successfully or with failure.
\ No newline at end of file
--- a/pjlib/src/pj/os_core_win32.c
+++ b/pjlib/src/pj/os_core_win32.c
@@ -1336,9 +1336,6 @@
PJ_LOG(6, (event->obj_name, "Pulsing event"));
- if (PulseEvent(event->hEvent))
- return PJ_SUCCESS;
- else
return PJ_RETURN_OS_ERROR(GetLastError());
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment