April 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r4860 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 05 Apr '07

05 Apr '07

Author: anthm Date: Thu Apr 5 10:58:07 2007 New Revision: 4860 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: fix contact thing for gateway calls Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Thu Apr 5 10:58:07 2007 @@ -416,7 +416,10 @@ char *url = sofia_glue_get_url_from_contact(tech_pvt->dest, 1); tech_pvt->nh = nua_handle(tech_pvt->profile->nua, NULL, NUTAG_URL(url), - SIPTAG_TO_STR(tech_pvt->dest_to), SIPTAG_FROM_STR(tech_pvt->from_str), SIPTAG_CONTACT_STR(tech_pvt->profile->url), + SIPTAG_TO_STR(tech_pvt->dest_to), + SIPTAG_FROM_STR(tech_pvt->from_str), + TAG_IF(tech_pvt->invite_contact, SIPTAG_CONTACT_STR(tech_pvt->invite_contact)), + TAG_IF(!tech_pvt->invite_contact, SIPTAG_CONTACT_STR(tech_pvt->profile->url)), TAG_END()); switch_safe_free(url); @@ -472,7 +475,6 @@ TAG_IF(!switch_strlen_zero(alert_info), SIPTAG_HEADER_STR(alert_info)), TAG_IF(!switch_strlen_zero(extra_headers), SIPTAG_HEADER_STR(extra_headers)), TAG_IF(!switch_strlen_zero(max_forwards), SIPTAG_MAX_FORWARDS_STR(max_forwards)), - TAG_IF(tech_pvt->invite_contact, SIPTAG_CONTACT_STR(tech_pvt->invite_contact)), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_RTP_SORT(SOA_RTP_SORT_REMOTE), SOATAG_RTP_SELECT(SOA_RTP_SELECT_ALL), TAG_IF(rep, SIPTAG_REPLACES_STR(rep)), SOATAG_HOLD(holdstr), TAG_END());

1 0

[commit] r4859 - freeswitch/trunk/build
by Freeswitch SVN 05 Apr '07

05 Apr '07

Author: anthm Date: Thu Apr 5 10:57:20 2007 New Revision: 4859 Modified: freeswitch/trunk/build/turbo_build.sh Log: make turbo install too Modified: freeswitch/trunk/build/turbo_build.sh ============================================================================== --- freeswitch/trunk/build/turbo_build.sh (original) +++ freeswitch/trunk/build/turbo_build.sh Thu Apr 5 10:57:20 2007 @@ -21,8 +21,8 @@ fi done if [ $x = 0 ] ; then - sleep 1 - echo done + echo Build finished. Making install + $MAKE install exit; fi sleep 1

1 0

[commit] r4858 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 05 Apr '07

05 Apr '07

Author: mikej Date: Thu Apr 5 06:54:08 2007 New Revision: 4858 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: silly cast. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Thu Apr 5 06:54:08 2007 @@ -583,7 +583,7 @@ assert(nh != NULL); id = switch_mprintf("sip:%s@%s", sub_to_user, sub_to_host); - expire_sec -= time(NULL); + expire_sec = (int)(expire_sec - time(NULL)); if (expire_sec < 0) { expire_sec = 3600; }

1 0

[commit] r4857 - freeswitch/trunk/libs/libdingaling/src
by Freeswitch SVN 05 Apr '07

05 Apr '07

Author: mikej Date: Thu Apr 5 06:53:38 2007 New Revision: 4857 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c Log: fix libdingaling build Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Thu Apr 5 06:53:38 2007 @@ -82,7 +82,7 @@ static int opt_timeout = 30; static void sha1_hash(char *out, char *in); -static int b64encode(unsigned char *in, uint32_t ilen, unsigned char *out, uint32_t olen); +static int b64encode(unsigned char *in, size_t ilen, unsigned char *out, size_t olen); static void ldl_random_string(char *buf, uint16_t len, char *set); static struct { @@ -835,11 +835,8 @@ key = ldl_handle_strdup(handle, from); ldl_strip_resource(key); - b64encode((unsigned char *)image, - bytes, - base64, - sizeof(base64)); - ap->base64 = strdup(base64); + b64encode((unsigned char *)image, bytes, base64, sizeof(base64)); + ap->base64 = strdup((const char *)base64); apr_hash_set(globals.avatar_hash, ap->path, APR_HASH_KEY_STRING, ap); apr_hash_set(globals.avatar_hash, key, APR_HASH_KEY_STRING, ap); return ap;

1 0

[commit] r4856 - freeswitch/trunk/libs/libdingaling/src
by Freeswitch SVN 05 Apr '07

05 Apr '07

Author: mikej Date: Thu Apr 5 06:23:09 2007 New Revision: 4856 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c Log: var types, use zize_t for lengths. Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Thu Apr 5 06:23:09 2007 @@ -43,6 +43,7 @@ #include <stdlib.h> #include <assert.h> #include <ctype.h> +#include <fcntl.h> #include <iksemel.h> #include <apr.h> #include <apr_network_io.h> @@ -72,6 +73,7 @@ #include "sha1.h" #ifdef _MSC_VER +#include <io.h> #pragma warning(disable:4127 4706) #endif @@ -833,7 +835,10 @@ key = ldl_handle_strdup(handle, from); ldl_strip_resource(key); - b64encode((unsigned char *)image, bytes, base64, sizeof(base64)); + b64encode((unsigned char *)image, + bytes, + base64, + sizeof(base64)); ap->base64 = strdup(base64); apr_hash_set(globals.avatar_hash, ap->path, APR_HASH_KEY_STRING, ap); apr_hash_set(globals.avatar_hash, key, APR_HASH_KEY_STRING, ap); @@ -1080,10 +1085,10 @@ static const char c64[65] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; #define B64BUFFLEN 1024 -static int b64encode(unsigned char *in, uint32_t ilen, unsigned char *out, uint32_t olen) +static int b64encode(unsigned char *in, size_t ilen, unsigned char *out, size_t olen) { int y=0,bytes=0; - uint32_t x=0; + size_t x=0; unsigned int b=0,l=0; for(x=0;x<ilen;x++) {

1 0

[commit] r4855 - freeswitch/trunk/libs/libdingaling/src
by Freeswitch SVN 05 Apr '07

05 Apr '07

Author: mikej Date: Thu Apr 5 06:14:20 2007 New Revision: 4855 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.h Log: fix inline fun on windows. Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.h ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.h (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.h Thu Apr 5 06:14:20 2007 @@ -38,8 +38,9 @@ \{ */ /* OMG */ -#ifdef WIN32 +#ifdef _MSC_VER #define __LDL_FUNC__ __FUNCTION__ +#define inline __inline #else #define __LDL_FUNC__ (const char *)__func__ #endif @@ -203,7 +204,7 @@ } if (id_a_host && id_b_host) { - int id_a_len = 0, id_b_len = 0, len = 0; + size_t id_a_len = 0, id_b_len = 0, len = 0; if ((id_a_r = strchr(id_a_host, '/'))) { id_a_len = id_a_r - id_a_host;

1 0

[commit] r4854 - in freeswitch/trunk: src src/include w32/Library
by Freeswitch SVN 05 Apr '07

05 Apr '07

Author: mikej Date: Thu Apr 5 06:07:25 2007 New Revision: 4854 Modified: freeswitch/trunk/src/include/switch_odbc.h freeswitch/trunk/src/include/switch_platform.h freeswitch/trunk/src/switch_odbc.c freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Log: msvc odbc build Modified: freeswitch/trunk/src/include/switch_odbc.h ============================================================================== --- freeswitch/trunk/src/include/switch_odbc.h (original) +++ freeswitch/trunk/src/include/switch_odbc.h Thu Apr 5 06:07:25 2007 @@ -44,7 +44,9 @@ #endif #include <sqltypes.h> -SWITCH_BEGIN_EXTERN_C struct switch_odbc_handle; +SWITCH_BEGIN_EXTERN_C + +struct switch_odbc_handle; typedef enum { SWITCH_ODBC_STATE_INIT, @@ -59,7 +61,7 @@ SWITCH_ODBC_FAIL = -1 } switch_odbc_status_t; -SWITCH_DECLARE(switch_odbc_handle_t) * switch_odbc_handle_new(char *dsn, char *username, char *password); +SWITCH_DECLARE(switch_odbc_handle_t *) switch_odbc_handle_new(char *dsn, char *username, char *password); SWITCH_DECLARE(switch_odbc_status_t) switch_odbc_handle_disconnect(switch_odbc_handle_t *handle); SWITCH_DECLARE(switch_odbc_status_t) switch_odbc_handle_connect(switch_odbc_handle_t *handle); SWITCH_DECLARE(void) switch_odbc_handle_destroy(switch_odbc_handle_t **handlep); @@ -69,6 +71,7 @@ char *sql, switch_core_db_callback_func_t callback, void *pdata); SWITCH_DECLARE(char *) switch_odbc_handle_get_error(switch_odbc_handle_t *handle, SQLHSTMT stmt); SWITCH_END_EXTERN_C + #endif /* For Emacs: * Local Variables: Modified: freeswitch/trunk/src/include/switch_platform.h ============================================================================== --- freeswitch/trunk/src/include/switch_platform.h (original) +++ freeswitch/trunk/src/include/switch_platform.h Thu Apr 5 06:07:25 2007 @@ -59,6 +59,12 @@ */ #pragma warning(disable:4100 4200 4204 4706 4819 4132 4510 4512 4610 4996) +#define SWITCH_HAVE_ODBC 1 + +#ifdef _MSC_VER +# pragma comment(lib, "odbc32.lib") +#endif + #pragma include_alias(<libteletone.h>, <../../libs/libteletone/src/libteletone.h>) #pragma include_alias(<libteletone_generate.h>, <../../libs/libteletone/src/libteletone_generate.h>) #pragma include_alias(<libteletone_detect.h>, <../../libs/libteletone/src/libteletone_detect.h>) Modified: freeswitch/trunk/src/switch_odbc.c ============================================================================== --- freeswitch/trunk/src/switch_odbc.c (original) +++ freeswitch/trunk/src/switch_odbc.c Thu Apr 5 06:07:25 2007 @@ -28,6 +28,7 @@ * switch_odbc.c -- ODBC * */ +#include <switch.h> #include <switch_odbc.h> struct switch_odbc_handle { @@ -162,7 +163,6 @@ return SWITCH_ODBC_SUCCESS; } - return SWITCH_ODBC_FAIL; } static int db_is_up(switch_odbc_handle_t *handle) @@ -227,7 +227,7 @@ SWITCH_DECLARE(switch_odbc_status_t) switch_odbc_handle_exec(switch_odbc_handle_t *handle, char *sql, SQLHSTMT *rstmt) { - SQLHSTMT stmt; + SQLHSTMT stmt = NULL; int result; if (!db_is_up(handle)) { @@ -270,7 +270,7 @@ SWITCH_DECLARE(switch_odbc_status_t) switch_odbc_handle_callback_exec(switch_odbc_handle_t *handle, char *sql, switch_core_db_callback_func_t callback, void *pdata) { - SQLHSTMT stmt; + SQLHSTMT stmt = NULL; SQLSMALLINT c = 0, x = 0; SQLINTEGER m = 0; int result; @@ -320,7 +320,7 @@ names[y] = malloc(name_len); memset(names[y], 0, name_len); - SQLDescribeCol(stmt, x, (SQLCHAR *) names[y], name_len, &NameLength, &DataType, &ColumnSize, &DecimalDigits, &Nullable); + SQLDescribeCol(stmt, x, (SQLCHAR *) names[y], (SQLSMALLINT)name_len, &NameLength, &DataType, &ColumnSize, &DecimalDigits, &Nullable); ColumnSize++; vals[y] = malloc(ColumnSize); Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Thu Apr 5 06:07:25 2007 @@ -352,6 +352,10 @@ > </File> <File + RelativePath="..\..\src\switch_odbc.c" + > + </File> + <File RelativePath="..\..\src\switch_regex.c" > </File> @@ -418,11 +422,11 @@ > </File> <File - RelativePath="..\..\src\include\switch_core.h" + RelativePath="..\..\src\include\private\switch_core.h" > </File> <File - RelativePath="..\..\src\include\private\switch_core.h" + RelativePath="..\..\src\include\switch_core.h" > </File> <File @@ -458,6 +462,10 @@ > </File> <File + RelativePath="..\..\src\include\switch_odbc.h" + > + </File> + <File RelativePath="..\..\src\include\switch_platform.h" > </File>

1 0

[commit] r4853 - freeswitch/trunk/libs/libdingaling/src
by Freeswitch SVN 04 Apr '07

04 Apr '07

Author: anthm Date: Wed Apr 4 19:21:19 2007 New Revision: 4853 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c Log: fix Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Wed Apr 4 19:21:19 2007 @@ -81,6 +81,7 @@ static void sha1_hash(char *out, char *in); static int b64encode(unsigned char *in, uint32_t ilen, unsigned char *out, uint32_t olen); +static void ldl_random_string(char *buf, uint16_t len, char *set); static struct { unsigned int flags; @@ -767,21 +768,47 @@ return IKS_FILTER_EAT; } -static ldl_avatar_t *ldl_get_avatar(char *path, char *from) +static char *ldl_handle_strdup(ldl_handle_t *handle, char *str) +{ + char *dup; + apr_size_t len; + + len = strlen(str) + 1; + dup = apr_palloc(handle->pool, len); + assert(dup != NULL); + strncpy(dup, str, len); + return dup; +} + +static void ldl_strip_resource(char *in) +{ + char *p; + + if ((p = strchr(in, '/'))) { + *p = '\0'; + } +} + +static ldl_avatar_t *ldl_get_avatar(ldl_handle_t *handle, char *path, char *from) { ldl_avatar_t *ap; uint8_t image[8192]; unsigned char base64[9216] = ""; int fd = -1; size_t bytes; - char *p; + char *key; - if (path && (ap = (ldl_avatar_t *) apr_hash_get(globals.avatar_hash, path, APR_HASH_KEY_STRING))) { + if (from && (ap = (ldl_avatar_t *) apr_hash_get(globals.avatar_hash, from, APR_HASH_KEY_STRING))) { return ap; } - if (from && (ap = (ldl_avatar_t *) apr_hash_get(globals.avatar_hash, from, APR_HASH_KEY_STRING))) { - return ap; + if (path && from) { + if ((ap = (ldl_avatar_t *) apr_hash_get(globals.avatar_hash, path, APR_HASH_KEY_STRING))) { + key = ldl_handle_strdup(handle, from); + ldl_strip_resource(key); + apr_hash_set(globals.avatar_hash, key, APR_HASH_KEY_STRING, ap); + return ap; + } } if (!(path && from)) { @@ -802,14 +829,14 @@ memset(ap, 0, sizeof(*ap)); sha1_hash(ap->hash, (char *)image); ap->path = strdup(path); - ap->from = strdup(from); - if ((p = strchr(ap->from, '/'))) { - *p = '\0'; - } + + key = ldl_handle_strdup(handle, from); + ldl_strip_resource(key); + b64encode((unsigned char *)image, bytes, base64, sizeof(base64)); ap->base64 = strdup(base64); apr_hash_set(globals.avatar_hash, ap->path, APR_HASH_KEY_STRING, ap); - apr_hash_set(globals.avatar_hash, ap->from, APR_HASH_KEY_STRING, ap); + apr_hash_set(globals.avatar_hash, key, APR_HASH_KEY_STRING, ap); return ap; } @@ -858,7 +885,7 @@ ldl_avatar_t *ap; if (avatar) { - if ((ap = ldl_get_avatar(avatar, from))) { + if ((ap = ldl_get_avatar(handle, avatar, from))) { if ((tag = iks_insert(pres, "x"))) { iks *hash; iks_insert_attrib(tag, "xmlns", "vcard-temp:x:update"); @@ -1740,7 +1767,7 @@ int e = 0; ldl_avatar_t *ap; - ap = ldl_get_avatar(NULL, from); + ap = ldl_get_avatar(handle, NULL, from); if (!vcard) { char text[8192];

1 0

[commit] r4852 - freeswitch/trunk/libs/libdingaling/src
by Freeswitch SVN 04 Apr '07

04 Apr '07

Author: anthm Date: Wed Apr 4 18:36:33 2007 New Revision: 4852 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c Log: one less Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Wed Apr 4 18:36:33 2007 @@ -1763,7 +1763,7 @@ vcard = text; } else { if (ap && (strstr(vcard, "photo") || strstr(vcard, "PHOTO"))) { - ldl_random_string(ap->hash, sizeof(ap->hash), NULL); + ldl_random_string(ap->hash, sizeof(ap->hash) -1, NULL); } }

1 0

[commit] r4851 - freeswitch/trunk/conf
by Freeswitch SVN 04 Apr '07

04 Apr '07

Author: anthm Date: Wed Apr 4 18:33:37 2007 New Revision: 4851 Modified: freeswitch/trunk/conf/dingaling.conf.xml freeswitch/trunk/conf/sofia.conf.xml Log: update config Modified: freeswitch/trunk/conf/dingaling.conf.xml ============================================================================== --- freeswitch/trunk/conf/dingaling.conf.xml (original) +++ freeswitch/trunk/conf/dingaling.conf.xml Wed Apr 4 18:33:37 2007 @@ -33,6 +33,7 @@   <param name="vad" value="both"/> +  </x-profile>  @@ -48,6 +49,10 @@  <param name="exten" value="_auto_"/>  +  +  +  + </x-profile> </configuration> Modified: freeswitch/trunk/conf/sofia.conf.xml ============================================================================== --- freeswitch/trunk/conf/sofia.conf.xml (original) +++ freeswitch/trunk/conf/sofia.conf.xml Wed Apr 4 18:33:37 2007 @@ -31,6 +31,9 @@ <param name="rtp-ip" value="auto"/> <param name="sip-ip" value="auto"/> +  +  +

1 0