Commit 32fcc17e authored by jehan's avatar jehan

finilize stun files move from ortp to ms2

parent f47428f6
......@@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define ice_h
#include "mscommon.h"
#include "ortp/stun_udp.h"
#include "ortp/stun.h"
#include "ortp/ortp.h"
......
......@@ -119,6 +119,8 @@ typedef void (*MSIterate2Func)(void *a, void *b);
#ifdef __cplusplus
extern "C"{
#endif
/*for stun*/
typedef struct { unsigned char octet[12]; } UInt96;
MS2_PUBLIC void ms_thread_exit(void* ret_val);
MS2_PUBLIC MSList * ms_list_append(MSList *elem, void * data);
......
......@@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define B64_NO_NAMESPACE
#endif
#include "ortp/b64.h"
#include "ortp/stun.h"
#include "stun.h"
static const int default_dtmf_duration_ms=100; /*in milliseconds*/
......
......@@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <inttypes.h>
#include "stun.h"
#include "mediastreamer2/ice.h"
#include "ortp/ortp.h"
......
......@@ -112,8 +112,8 @@
#endif /* __QNX__ */
#include "ortp/stun_udp.h"
#include "ortp/stun.h"
#include "stun_udp.h"
#include "stun.h"
#include "ortp/ortp.h"
static char *ipaddr(const StunAddress4 *addr)
......
......@@ -74,7 +74,8 @@
#include <stdio.h>
#include <time.h>
#include <ortp/port.h>
#include <ortp/stun_udp.h>
#include "mediastreamer2/mscommon.h"
#include "stun_udp.h"
#ifdef __APPLE__
#include "TargetConditionals.h"
......@@ -106,7 +107,6 @@ typedef unsigned __int64 uint64_t;
typedef unsigned long long uint64_t;
#endif
#endif
typedef struct { unsigned char octet[12]; } UInt96;
/* define a structure to hold a stun address */
#define IPv4Family 0x01
......
......@@ -110,7 +110,7 @@
#include <string.h>
#include "ortp/stun_udp.h"
#include "stun_udp.h"
#include "ortp/ortp.h"
#if !defined(WIN32) && !defined(_WIN32_WCE)
......
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