diff --git a/build_tarball.sh b/build_tarball.sh
index 3a6694ed50032ea2019d2bafcf2cfcee9214c933..623bdc8eb0e87ffad4dee69dc46e4a2ce5637a26 100755
--- a/build_tarball.sh
+++ b/build_tarball.sh
@@ -30,10 +30,12 @@ rm -rf $BUILDDIR
rm -f *.tar.gz
rm -rf lang/
-rm -rf tools/build-system/
-rm -f tools/pysflphone/*.pyc
-rm -f tools/build-package.sh tools/bleach.sh tools/autotoolize.sh
-rm -rf sflphone-client-kde/build
+rm -rf tools/
+rm -rf sflphone-client-kde/
+rm -rf sippxml
+
+rm -rf .git/
+rm -f .gitignore
find -name .project -type f -exec rm {} \;
find -name .cproject -type f -exec rm {} \;
@@ -56,6 +58,9 @@ rm -f pjlib-util/bin/pjlib-util-test-x86_64-unknown-linux-gnu
rm -f pjnath/bin/pjturn-srv-x86_64-unknown-linux-gnu
rm -f pjmedia/bin/pjmedia-test-x86_64-unknown-linux-gnu
+rm -f third_party/portaudio/src/hostapi/asio/Pa_ASIO.pdf
+rm -f third_party/portaudio/src/hostapi/asio/Callback_adaptation_.pdf
+
# Put actual files in the tarball
rm -f config.guess config.sub
cp /usr/share/misc/config.guess .
diff --git a/sflphone-common/libs/iax2/iax.c b/sflphone-common/libs/iax2/iax.c
index 5c184a1de6727ce75b0ed00ffa588b593cbeb4d1..67f9db7b0de8292232075eed9c72456cdde5aacf 100644
--- a/sflphone-common/libs/iax2/iax.c
+++ b/sflphone-common/libs/iax2/iax.c
@@ -1889,17 +1889,17 @@ static int iax_send_txready(struct iax_session *session)
int iax_auth_reply(struct iax_session *session, char *password, char *challenge, int methods)
{
char reply[16];
- struct MD5Context md5;
+ struct IAX_MD5Context md5;
char realreply[256];
struct iax_ie_data ied;
memset(&ied, 0, sizeof(ied));
if ((methods & IAX_AUTH_MD5) && challenge) {
- MD5Init(&md5);
- MD5Update(&md5, (const unsigned char *) challenge,
+ IAX_MD5Init(&md5);
+ IAX_MD5Update(&md5, (const unsigned char *) challenge,
(unsigned int)strlen(challenge));
- MD5Update(&md5, (const unsigned char *) password,
+ IAX_MD5Update(&md5, (const unsigned char *) password,
(unsigned int)strlen(password));
- MD5Final((unsigned char *) reply, &md5);
+ IAX_MD5Final((unsigned char *) reply, &md5);
memset(realreply, 0, sizeof(realreply));
convert_reply(realreply, (unsigned char *) reply);
iax_ie_append_str(&ied, IAX_IE_MD5_RESULT, realreply);
@@ -1912,19 +1912,19 @@ int iax_auth_reply(struct iax_session *session, char *password, char *challenge,
static int iax_regauth_reply(struct iax_session *session, char *password, char *challenge, int methods)
{
char reply[16];
- struct MD5Context md5;
+ struct IAX_MD5Context md5;
char realreply[256];
struct iax_ie_data ied;
memset(&ied, 0, sizeof(ied));
iax_ie_append_str(&ied, IAX_IE_USERNAME, session->username);
iax_ie_append_short(&ied, IAX_IE_REFRESH, session->refresh);
if ((methods & IAX_AUTHMETHOD_MD5) && challenge) {
- MD5Init(&md5);
- MD5Update(&md5, (const unsigned char *) challenge,
+ IAX_MD5Init(&md5);
+ IAX_MD5Update(&md5, (const unsigned char *) challenge,
(unsigned int)strlen(challenge));
- MD5Update(&md5, (const unsigned char *) password,
+ IAX_MD5Update(&md5, (const unsigned char *) password,
(unsigned int)strlen(password));
- MD5Final((unsigned char *) reply, &md5);
+ IAX_MD5Final((unsigned char *) reply, &md5);
memset(realreply, 0, sizeof(realreply));
convert_reply(realreply, (unsigned char *) reply);
iax_ie_append_str(&ied, IAX_IE_MD5_RESULT, realreply);
diff --git a/sflphone-common/libs/iax2/md5.c b/sflphone-common/libs/iax2/md5.c
index 401216ee27167b9e048cdcaa7831e65aed7bb303..56382221c44102643e3c38482b8b826cd716b52d 100644
--- a/sflphone-common/libs/iax2/md5.c
+++ b/sflphone-common/libs/iax2/md5.c
@@ -51,15 +51,15 @@
#include "md5.h"
#ifndef HIGHFIRST
-#define byteReverse(buf, len) /* Nothing */
+#define IAX_byteReverse(buf, len) /* Nothing */
#else
-void byteReverse(uint8_t *buf, unsigned int longs);
+void IAX_byteReverse(uint8_t *buf, unsigned int longs);
#ifndef ASM_MD5
/*
* Note: this code is harmless on little-endian machines.
*/
-void byteReverse(uint8_t *buf, unsigned int longs)
+void IAX_byteReverse(uint8_t *buf, unsigned int longs)
{
uint32_t t;
do {
@@ -76,7 +76,7 @@ void byteReverse(uint8_t *buf, unsigned int longs)
* Start MD5 accumulation. Set bit count to 0 and buffer to mysterious
* initialization constants.
*/
-void MD5Init(struct MD5Context *ctx)
+void IAX_MD5Init(struct IAX_MD5Context *ctx)
{
ctx->buf[0] = 0x67452301;
ctx->buf[1] = 0xefcdab89;
@@ -91,7 +91,7 @@ void MD5Init(struct MD5Context *ctx)
* Update context to reflect the concatenation of another buffer full
* of bytes.
*/
-void MD5Update(struct MD5Context *ctx, uint8_t const *buf, unsigned int len)
+void IAX_MD5Update(struct IAX_MD5Context *ctx, uint8_t const *buf, unsigned int len)
{
uint32_t t;
@@ -115,8 +115,8 @@ void MD5Update(struct MD5Context *ctx, uint8_t const *buf, unsigned int len)
return;
}
memcpy(p, buf, t);
- byteReverse(ctx->in, 16);
- MD5Transform(ctx->buf, (uint32_t *) ctx->in);
+ IAX_byteReverse(ctx->in, 16);
+ IAX_MD5Transform(ctx->buf, (uint32_t *) ctx->in);
buf += t;
len -= t;
}
@@ -124,8 +124,8 @@ void MD5Update(struct MD5Context *ctx, uint8_t const *buf, unsigned int len)
while (len >= 64) {
memcpy(ctx->in, buf, 64);
- byteReverse(ctx->in, 16);
- MD5Transform(ctx->buf, (uint32_t *) ctx->in);
+ IAX_byteReverse(ctx->in, 16);
+ IAX_MD5Transform(ctx->buf, (uint32_t *) ctx->in);
buf += 64;
len -= 64;
}
@@ -139,7 +139,7 @@ void MD5Update(struct MD5Context *ctx, uint8_t const *buf, unsigned int len)
* Final wrapup - pad to 64-byte boundary with the bit pattern
* 1 0* (64-bit count of bits processed, MSB-first)
*/
-void MD5Final(uint8_t digest[16], struct MD5Context *ctx)
+void IAX_MD5Final(uint8_t digest[16], struct IAX_MD5Context *ctx)
{
unsigned int count;
uint8_t *p;
@@ -159,8 +159,8 @@ void MD5Final(uint8_t digest[16], struct MD5Context *ctx)
if (count < 8) {
/* Two lots of padding: Pad the first block to 64 bytes */
memset(p, 0, count);
- byteReverse(ctx->in, 16);
- MD5Transform(ctx->buf, (uint32_t *) ctx->in);
+ IAX_byteReverse(ctx->in, 16);
+ IAX_MD5Transform(ctx->buf, (uint32_t *) ctx->in);
/* Now fill the next block with 56 bytes */
memset(ctx->in, 0, 56);
@@ -168,30 +168,30 @@ void MD5Final(uint8_t digest[16], struct MD5Context *ctx)
/* Pad block to 56 bytes */
memset(p, 0, count - 8);
}
- byteReverse(ctx->in, 14);
+ IAX_byteReverse(ctx->in, 14);
/* Append length in bits and transform */
((uint32_t *) ctx->in)[14] = ctx->bits[0];
((uint32_t *) ctx->in)[15] = ctx->bits[1];
- MD5Transform(ctx->buf, (uint32_t *) ctx->in);
- byteReverse((uint8_t *) ctx->buf, 4);
+ IAX_MD5Transform(ctx->buf, (uint32_t *) ctx->in);
+ IAX_byteReverse((uint8_t *) ctx->buf, 4);
memcpy(digest, ctx->buf, 16);
memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */
}
#ifndef ASM_MD5
-/* The four core functions - F1 is optimized somewhat */
+/* The four core functions - IAX_F1 is optimized somewhat */
-/* #define F1(x, y, z) (x & y | ~x & z) */
-#define F1(x, y, z) (z ^ (x & (y ^ z)))
-#define F2(x, y, z) F1(z, x, y)
-#define F3(x, y, z) (x ^ y ^ z)
-#define F4(x, y, z) (y ^ (x | ~z))
+/* #define IAX_F1(x, y, z) (x & y | ~x & z) */
+#define IAX_F1(x, y, z) (z ^ (x & (y ^ z)))
+#define IAX_F2(x, y, z) IAX_F1(z, x, y)
+#define IAX_F3(x, y, z) (x ^ y ^ z)
+#define IAX_F4(x, y, z) (y ^ (x | ~z))
/* This is the central step in the MD5 algorithm. */
-#define MD5STEP(f, w, x, y, z, data, s) \
+#define IAX_MD5STEP(f, w, x, y, z, data, s) \
( w += f(x, y, z) + data, w = w<<s | w>>(32-s), w += x )
/*
@@ -199,7 +199,7 @@ void MD5Final(uint8_t digest[16], struct MD5Context *ctx)
* reflect the addition of 16 longwords of new data. MD5Update blocks
* the data and converts bytes into longwords for this routine.
*/
-void MD5Transform(uint32_t buf[4], uint32_t const in[16])
+void IAX_MD5Transform(uint32_t buf[4], uint32_t const in[16])
{
uint32_t a, b, c, d;
@@ -208,73 +208,73 @@ void MD5Transform(uint32_t buf[4], uint32_t const in[16])
c = buf[2];
d = buf[3];
- MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
- MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
- MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
- MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
- MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
- MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
- MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
- MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
- MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
- MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
- MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
- MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
- MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
- MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
- MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
- MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
-
- MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
- MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
- MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
- MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
- MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
- MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
- MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
- MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
- MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
- MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
- MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
- MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
- MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
- MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
- MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
- MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
-
- MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
- MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
- MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
- MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
- MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
- MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
- MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
- MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
- MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
- MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
- MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
- MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
- MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
- MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
- MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
- MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
-
- MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
- MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
- MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
- MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
- MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
- MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
- MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
- MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
- MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
- MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
- MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
- MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
- MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
- MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
- MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
- MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
+ IAX_MD5STEP(IAX_F1, a, b, c, d, in[0] + 0xd76aa478, 7);
+ IAX_MD5STEP(IAX_F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
+ IAX_MD5STEP(IAX_F1, c, d, a, b, in[2] + 0x242070db, 17);
+ IAX_MD5STEP(IAX_F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
+ IAX_MD5STEP(IAX_F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
+ IAX_MD5STEP(IAX_F1, d, a, b, c, in[5] + 0x4787c62a, 12);
+ IAX_MD5STEP(IAX_F1, c, d, a, b, in[6] + 0xa8304613, 17);
+ IAX_MD5STEP(IAX_F1, b, c, d, a, in[7] + 0xfd469501, 22);
+ IAX_MD5STEP(IAX_F1, a, b, c, d, in[8] + 0x698098d8, 7);
+ IAX_MD5STEP(IAX_F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
+ IAX_MD5STEP(IAX_F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
+ IAX_MD5STEP(IAX_F1, b, c, d, a, in[11] + 0x895cd7be, 22);
+ IAX_MD5STEP(IAX_F1, a, b, c, d, in[12] + 0x6b901122, 7);
+ IAX_MD5STEP(IAX_F1, d, a, b, c, in[13] + 0xfd987193, 12);
+ IAX_MD5STEP(IAX_F1, c, d, a, b, in[14] + 0xa679438e, 17);
+ IAX_MD5STEP(IAX_F1, b, c, d, a, in[15] + 0x49b40821, 22);
+
+ IAX_MD5STEP(IAX_F2, a, b, c, d, in[1] + 0xf61e2562, 5);
+ IAX_MD5STEP(IAX_F2, d, a, b, c, in[6] + 0xc040b340, 9);
+ IAX_MD5STEP(IAX_F2, c, d, a, b, in[11] + 0x265e5a51, 14);
+ IAX_MD5STEP(IAX_F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
+ IAX_MD5STEP(IAX_F2, a, b, c, d, in[5] + 0xd62f105d, 5);
+ IAX_MD5STEP(IAX_F2, d, a, b, c, in[10] + 0x02441453, 9);
+ IAX_MD5STEP(IAX_F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
+ IAX_MD5STEP(IAX_F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
+ IAX_MD5STEP(IAX_F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
+ IAX_MD5STEP(IAX_F2, d, a, b, c, in[14] + 0xc33707d6, 9);
+ IAX_MD5STEP(IAX_F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
+ IAX_MD5STEP(IAX_F2, b, c, d, a, in[8] + 0x455a14ed, 20);
+ IAX_MD5STEP(IAX_F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
+ IAX_MD5STEP(IAX_F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
+ IAX_MD5STEP(IAX_F2, c, d, a, b, in[7] + 0x676f02d9, 14);
+ IAX_MD5STEP(IAX_F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
+
+ IAX_MD5STEP(IAX_F3, a, b, c, d, in[5] + 0xfffa3942, 4);
+ IAX_MD5STEP(IAX_F3, d, a, b, c, in[8] + 0x8771f681, 11);
+ IAX_MD5STEP(IAX_F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
+ IAX_MD5STEP(IAX_F3, b, c, d, a, in[14] + 0xfde5380c, 23);
+ IAX_MD5STEP(IAX_F3, a, b, c, d, in[1] + 0xa4beea44, 4);
+ IAX_MD5STEP(IAX_F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
+ IAX_MD5STEP(IAX_F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
+ IAX_MD5STEP(IAX_F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
+ IAX_MD5STEP(IAX_F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
+ IAX_MD5STEP(IAX_F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
+ IAX_MD5STEP(IAX_F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
+ IAX_MD5STEP(IAX_F3, b, c, d, a, in[6] + 0x04881d05, 23);
+ IAX_MD5STEP(IAX_F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
+ IAX_MD5STEP(IAX_F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
+ IAX_MD5STEP(IAX_F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
+ IAX_MD5STEP(IAX_F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
+
+ IAX_MD5STEP(IAX_F4, a, b, c, d, in[0] + 0xf4292244, 6);
+ IAX_MD5STEP(IAX_F4, d, a, b, c, in[7] + 0x432aff97, 10);
+ IAX_MD5STEP(IAX_F4, c, d, a, b, in[14] + 0xab9423a7, 15);
+ IAX_MD5STEP(IAX_F4, b, c, d, a, in[5] + 0xfc93a039, 21);
+ IAX_MD5STEP(IAX_F4, a, b, c, d, in[12] + 0x655b59c3, 6);
+ IAX_MD5STEP(IAX_F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
+ IAX_MD5STEP(IAX_F4, c, d, a, b, in[10] + 0xffeff47d, 15);
+ IAX_MD5STEP(IAX_F4, b, c, d, a, in[1] + 0x85845dd1, 21);
+ IAX_MD5STEP(IAX_F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
+ IAX_MD5STEP(IAX_F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
+ IAX_MD5STEP(IAX_F4, c, d, a, b, in[6] + 0xa3014314, 15);
+ IAX_MD5STEP(IAX_F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
+ IAX_MD5STEP(IAX_F4, a, b, c, d, in[4] + 0xf7537e82, 6);
+ IAX_MD5STEP(IAX_F4, d, a, b, c, in[11] + 0xbd3af235, 10);
+ IAX_MD5STEP(IAX_F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
+ IAX_MD5STEP(IAX_F4, b, c, d, a, in[9] + 0xeb86d391, 21);
buf[0] += a;
buf[1] += b;
diff --git a/sflphone-common/libs/iax2/md5.h b/sflphone-common/libs/iax2/md5.h
index 81c9e30613b890f34e38663f9cc536dfa7cb4b0a..b3ad37a9b36532268cc9f3e62d909963c70e8e01 100644
--- a/sflphone-common/libs/iax2/md5.h
+++ b/sflphone-common/libs/iax2/md5.h
@@ -8,20 +8,20 @@ typedef unsigned int uint32_t;
typedef unsigned char uint8_t;
#endif
-struct MD5Context {
+struct IAX_MD5Context {
uint32_t buf[4];
uint32_t bits[2];
uint8_t in[64];
};
-void MD5Init(struct MD5Context *context);
-void MD5Update(struct MD5Context *context, uint8_t const *buf, unsigned int len);
-void MD5Final(uint8_t digest[16], struct MD5Context *context);
-void MD5Transform(uint32_t buf[4], uint32_t const in[16]);
+void IAX_MD5Init(struct IAX_MD5Context *context);
+void IAX_MD5Update(struct IAX_MD5Context *context, uint8_t const *buf, unsigned int len);
+void IAX_MD5Final(uint8_t digest[16], struct IAX_MD5Context *context);
+void IAX_MD5Transform(uint32_t buf[4], uint32_t const in[16]);
/*
* This is needed to make RSAREF happy on some MS-DOS compilers.
*/
-typedef struct MD5Context MD5_CTX;
+typedef struct IAX_MD5Context MD5_CTX;
#endif /* !MD5_H */
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/config.h b/sflphone-common/libs/pjproject/pjlib/include/pj/config.h
index 3b211abd85e23247b084898137a17b2d78f1fba0..ce7a97cc1a6bb99fbc9589a85a8776468967d2f9 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/config.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/config.h
@@ -275,6 +275,48 @@
# define PJ_HAS_PENTIUM 0
# define PJ_IS_LITTLE_ENDIAN 1
# define PJ_IS_BIG_ENDIAN 0
+
+#elif defined (PJ_M_SH) || defined(__sh) || defined(__sh__) || \
+ defined(__SH__) || defined(__M_SH) || defined(_ARCH_SH)
+ /*
+ * Renesas SH, little endian and big endian
+ */
+# undef PJ_M_SH
+# define PJ_M_SH 1
+# define PJ_M_NAME "sh"
+# define PJ_HAS_PENTIUM 0
+# if defined(__LITTLE_ENDIAN__)
+# define PJ_IS_LITTLE_ENDIAN 1
+# define PJ_IS_BIG_ENDIAN 0
+# elif defined(__BIG_ENDIAN__)
+# define PJ_IS_LITTLE_ENDIAN 0
+# define PJ_IS_BIG_ENDIAN 1
+# endif
+
+#elif defined (PJ_M_HPPA) || defined(__hppa) || defined(__hppa__) || \
+ defined(__HPPA__) || defined(__M_HPPA) || defined(_ARCH_HPPA)
+ /*
+ * HP/PA, big endian
+ */
+# undef PJ_M_HPPA
+# define PJ_M_HPPA 1
+# define PJ_M_NAME "hppa"
+# define PJ_HAS_PENTIUM 0
+# define PJ_IS_LITTLE_ENDIAN 0
+# define PJ_IS_BIG_ENDIAN 1
+
+#elif defined (PJ_M_S390) || defined(__s390) || defined(__s390__) || defined(__s390x) || \
+ defined(__s390x__) || defined(__M_s390) || defined(_ARCH_s390)
+ /*
+ * System 390, big endian
+ */
+# undef PJ_M_S390
+# define PJ_M_S390 1
+# define PJ_M_NAME "s390"
+# define PJ_HAS_PENTIUM 0
+# define PJ_IS_LITTLE_ENDIAN 0
+# define PJ_IS_BIG_ENDIAN 1
+
#else
# error "Please specify target machine."
diff --git a/sflphone-common/src/audio/audiortp/AudioRtpSession.h b/sflphone-common/src/audio/audiortp/AudioRtpSession.h
index 7ec80ebc86ee0ae8810bc2c396f084484924d37c..0de99baa0108d19e4cd1bc4d0ad33b3edd1f1e87 100644
--- a/sflphone-common/src/audio/audiortp/AudioRtpSession.h
+++ b/sflphone-common/src/audio/audiortp/AudioRtpSession.h
@@ -50,6 +50,8 @@
#include <ccrtp/rtp.h>
#include <cc++/numbers.h> // ost::Time
+#include <speex/speex_jitter.h>
+
// Frequency (in packet number)
#define RTP_TIMESTAMP_RESET_FREQ 100
@@ -229,9 +231,18 @@ namespace sfl {
* EventQueue used to store list of DTMF-
*/
EventQueue _eventQueue;
+
+ JitterBuffer *_jbuffer;
+
+ int _ts;
+
+ int jitterSeqNum;
protected:
+
SIPCall * _ca;
+
+ bool onRTPPacketRecv(ost::IncomingRTPPkt&);
};
template <typename D>
@@ -255,6 +266,7 @@ namespace sfl {
_timestampIncrement(0),
_timestampCount(0),
_countNotificationTime(0),
+ _jbuffer(NULL),
_ca (sipcall)
{
setCancel (cancelDefault);
@@ -271,6 +283,13 @@ namespace sfl {
_layerFrameSize = _audiolayer->getFrameSize(); // in ms
_layerSampleRate = _audiolayer->getSampleRate();
+ _jbuffer = jitter_buffer_init(20);
+ _ts = 0;
+ jitterSeqNum = 0;
+
+ // int i = 160;
+ // jitter_buffer_ctl(_jbuffer, JITTER_BUFFER_SET_MARGIN, &i);
+ // jitter_buffer_ctl(_jbuffer, JITTER_BUFFER_SET_CONCEALMENT_SIZE, &i);
}
template <typename D>
@@ -296,8 +315,10 @@ namespace sfl {
delete _converter;
if (_audiocodec) {
- delete _audiocodec; _audiocodec = NULL;
+ delete _audiocodec; _audiocodec = NULL;
}
+
+ jitter_buffer_destroy(_jbuffer);
}
template <typename D>
@@ -476,13 +497,21 @@ namespace sfl {
}
}
+ template <typename D>
+ bool onRTPPacketRecv(ost::IncomingRTPPkt&)
+ {
+ _debug("AudioRtpSession: onRTPPacketRecv");
+
+ return true;
+ }
+
+
template <typename D>
int AudioRtpSession<D>::processDataEncode(void)
{
assert(_audiocodec);
assert(_audiolayer);
-
int _mainBufferSampleRate = _manager->getAudioDriver()->getMainBuffer()->getInternalSamplingRate();
// compute codec framesize in ms
@@ -625,7 +654,9 @@ namespace sfl {
const ost::AppDataUnit* adu = NULL;
- adu = static_cast<D*>(this)->getData(static_cast<D*>(this)->getFirstTimestamp());
+ int packetTimestamp = static_cast<D*>(this)->getFirstTimestamp();
+ adu = static_cast<D*>(this)->getData(packetTimestamp);
+ // packetTimestamp = adu->getgetTimestamp();
if (adu == NULL) {
// _debug("No RTP audio stream\n");
@@ -633,19 +664,66 @@ namespace sfl {
}
unsigned char* spkrData = (unsigned char*) adu->getData(); // data in char
-
unsigned int size = adu->getSize(); // size in char
+ JitterBufferPacket jPacketIn;
+ jPacketIn.data = (char *)spkrData;
+ jPacketIn.len = size;
+ // jPacketIn.timestamp = static_cast<D*>(this)->getFirstTimestamp();
+ jPacketIn.timestamp = jitterSeqNum * _timestampIncrement;
+ jPacketIn.span = _timestampIncrement;
+ jPacketIn.sequence = ++jitterSeqNum;
+
+ jitter_buffer_put(_jbuffer, &jPacketIn);
+
+ JitterBufferPacket jPacketOut;
+ jPacketOut.data = new char[size];
+ jPacketOut.len = size;
+ jPacketIn.timestamp = 0;
+ jPacketIn.span = 0;
+ jPacketIn.sequence = 0;
+
+ int desiredSpan = _timestampIncrement;
+ spx_int32_t offs = 0;
+
+ int result = JITTER_BUFFER_INTERNAL_ERROR;
+ result = jitter_buffer_get(_jbuffer, &jPacketOut, desiredSpan, &offs);
+ jitter_buffer_tick(_jbuffer);
+
+ /*
+ switch(result) {
+ case JITTER_BUFFER_OK:
+ _debug("JITTER_BUFFER_OK");
+ break;
+ case JITTER_BUFFER_MISSING:
+ _debug("JITTER_BUFFER_MISSING");
+ break;
+ case JITTER_BUFFER_INTERNAL_ERROR:
+ _debug("JITTER_BUFFER_INTERNAL_ERROR");
+ break;
+ case JITTER_BUFFER_BAD_ARGUMENT:
+ _debug("JITTER_BUFFER_BAD_ARGUMENT");
+ break;
+ default:
+ _debug("Unknown error");
+ break;
+ }
+ */
+
// DTMF over RTP, size must be over 4 in order to process it as voice data
if(size > 4) {
- processDataDecode (spkrData, size);
+ // processDataDecode(spkrData, size);
+ if(result == JITTER_BUFFER_OK)
+ processDataDecode ((unsigned char *)jPacketOut.data, jPacketOut.len);
}
else {
- // _debug("RTP: Received an RTP event with payload: %d", adu->getType());
- // ost::RTPPacket::RFC2833Payload *dtmf = (ost::RTPPacket::RFC2833Payload *)adu->getData();
- // _debug("RTP: Data received %d", dtmf->event);
-
+ // _debug("RTP: Received an RTP event with payload: %d", adu->getType());
+ // ost::RTPPacket::RFC2833Payload *dtmf = (ost::RTPPacket::RFC2833Payload *)adu->getData();
+ // _debug("RTP: Data received %d", dtmf->event);
}
+
+ delete jPacketOut.data;
+ delete adu;
}
template <typename D>
@@ -664,6 +742,8 @@ namespace sfl {
// Timestamp must be initialized randomly
_timestamp = static_cast<D*>(this)->getCurrentTimestamp();
+ _ts = 0;
+
int sessionWaiting;
int threadSleep = 0;
@@ -682,9 +762,9 @@ namespace sfl {
}
_ca->setRecordingSmplRate(_audiocodec->getClockRate());
-
+
// Start audio stream (if not started) AND flush all buffers (main and urgent)
- _manager->getAudioDriver()->startStream();
+ _manager->getAudioDriver()->startStream();
static_cast<D*>(this)->startRunning();