- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r6081 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 29 Oct '07

29 Oct '07

Author: mikej Date: Mon Oct 29 02:42:13 2007 New Revision: 6081 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: fix for MODAPP-41 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Mon Oct 29 02:42:13 2007 @@ -28,6 +28,7 @@ * Johny Kadarisman <jkr888(a)gmail.com> * Paul Tinsley <jackhammer(a)gmail.com> * Marcel Barbulescu <marcelbarbulescu(a)gmail.com> + * Bret McDanel <trixter AT 0xdecafbad.com> * * * mod_commands.c -- Misc. Command Module @@ -265,7 +266,7 @@ if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); - if (argc >= 2 && argc <= 4) { + if (argc >= 2 && argc <= 5) { char *uuid = argv[0]; char *dest = argv[1]; char *dp = argv[2];

1 0

[commit] r6080 - freeswitch/trunk/src
by Freeswitch SVN 29 Oct '07

29 Oct '07

Author: mikej Date: Mon Oct 29 02:16:41 2007 New Revision: 6080 Modified: freeswitch/trunk/src/switch_utils.c Log: replace switch_stristr implementation with one that shouldn't segfault. Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Mon Oct 29 02:16:41 2007 @@ -199,24 +199,46 @@ SWITCH_DECLARE(const char *) switch_stristr(const char *str, const char *instr) { - switch_size_t score = strlen(str), x = 0; - const char *a = str, *b = instr, *p = NULL; - while(*a && *b) { - if (tolower(*b) == tolower(*a)) { - if (++x == score) { - return b - x + 1; - } - a++; - } else { - a = str; - p = b+1; - x = 0; +/* +** Rev History: 16/07/97 Greg Thayer Optimized +** 07/04/95 Bob Stout ANSI-fy +** 02/03/94 Fred Cole Original +** 09/01/03 Bob Stout Bug fix (lines 40-41) per Fred Bulback +** +** Hereby donated to public domain. +*/ + + const char *pptr, *sptr, *start; + + if (!str || !instr) + return NULL; + + for (start = str; *start; start++) { + /* find start of pattern in string */ + for ( ; ((*start) && (toupper(*start) != toupper(*instr))); start++); + + if (!*start) + return NULL; + + pptr = instr; + sptr = start; + + while (toupper(*sptr) == toupper(*pptr)) { + sptr++; + pptr++; + + /* if end of pattern then pattern was found */ + if (!*pptr) + return (start); + + if (!*sptr) + return NULL; } - b++; } return NULL; } + SWITCH_DECLARE(switch_status_t) switch_find_local_ip(char *buf, int len, int family) { switch_status_t status = SWITCH_STATUS_FALSE;

1 0

[commit] r6079 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 Oct '07

29 Oct '07

Author: mikej Date: Mon Oct 29 01:03:28 2007 New Revision: 6079 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: fix for MODENDP-34 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Mon Oct 29 01:03:28 2007 @@ -891,8 +891,7 @@ } if (!(xparams = switch_xml_child(user, "params"))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "can't find params for user [%s@%s]\n", username, realm); - ret = AUTH_FORBIDDEN; + ret = AUTH_OK; goto end; }

1 0

[commit] r6078 - freeswitch/trunk/src/mod/endpoints/mod_opal
by Freeswitch SVN 28 Oct '07

28 Oct '07

Author: lzwierko Date: Sun Oct 28 17:55:20 2007 New Revision: 6078 Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/opalh323_backend.cpp freeswitch/trunk/src/mod/endpoints/mod_opal/opalh323_backend.h Log: still lots of compile errors, but I got to get some sleep ;) Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/opalh323_backend.cpp ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/opalh323_backend.cpp (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/opalh323_backend.cpp Sun Oct 28 17:55:20 2007 @@ -29,7 +29,6 @@ #include <switch.h> #include "opalh323_backend.h" -#include <include/h323/h323ep.h> /** * Private structre @@ -52,7 +51,7 @@ assert(0); return false; } - if(SWITCH_STATUS_SUCCESS != switch_mutex_init(&tech_pvt->m_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(i_session)) + if(SWITCH_STATUS_SUCCESS != switch_mutex_init(&(*o_private)->m_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(i_session))) { assert(0); return false; @@ -64,7 +63,7 @@ static bool OpalH323Private_Delete(OpalH323Private_t *o_private) { - switch_mutex_destroy(tech_pvt->m_mutex); + switch_mutex_destroy(o_private->m_mutex); } /** Default constructor @@ -84,7 +83,7 @@ /** Destructor * */ -~FSOpalManager::FSOpalManager() +FSOpalManager::~FSOpalManager() { /** * Destroy all allocated resources, if any @@ -93,28 +92,24 @@ { delete m_pH323Endpoint; switch_mutex_destroy(m_pSessionsHashTableMutex); - switch_core_hash_destroy(m_pSessionsHashTable); + switch_core_hash_destroy(&m_pSessionsHashTable); } } /** * Method does real initialization of the manager - */ + */ bool FSOpalManager::initialize( - char *i_modName, - switch_memory_pool_t *i_memoryPool, - switch_endpoint_interface_t *i_endpointInterface - ) + const char* i_modName, + switch_memory_pool_t* i_memoryPool, + switch_endpoint_interface_t *i_endpointInterface + ) { bool result = true; - /* check if everything is not initialized */ + /* check if not initialized */ assert(m_isInitialized); - assert(!m_pH323Endpoint); - assert(!m_pMemoryPool) - assert(!m_pEndpointInterface); - assert(!m_pSessionsHashTable); /* check input parameters */ assert(i_modName); @@ -138,19 +133,19 @@ return false; } - if(switch_mutex_init(&m_pSessionsHashTableMutex,SWITCH_THREAD_MUTEX_UNNESTED,m_pMemoryPool)!=SWITCH_STATUS_SUCCESS) + if(switch_mutex_init(&m_pSessionsHashTableMutex,SWITCH_MUTEX_UNNESTED,m_pMemoryPool)!=SWITCH_STATUS_SUCCESS) { assert(0); - switch_core_hash_destroy(m_pSessionsHashTable); + switch_core_hash_destroy(&m_pSessionsHashTable); return false; } /* create h323 endpoint */ - m_pH323Endpoint = new H323EndPoint(this); ///TODO, replace prefix and signaling port by values from configuration + m_pH323Endpoint = new H323EndPoint( *(static_cast<OpalManager*>(this)) ); ///TODO, replace prefix and signaling port by values from configuration if(!m_pH323Endpoint) { assert(0); - switch_core_hash_destroy(m_pSessionsHashTable); + switch_core_hash_destroy(&m_pSessionsHashTable); switch_mutex_destroy(m_pSessionsHashTableMutex); return false; } @@ -172,9 +167,9 @@ if(!m_pH323Endpoint->StartListeners(opalTransportAddress)) { assert(0); - swith_core_hash_destroy(m_pSessionsHashTable); + switch_core_hash_destroy(&m_pSessionsHashTable); switch_mutex_destroy(m_pSessionsHashTableMutex); - delete m_pH323Endpoint: + delete m_pH323Endpoint; return false; } @@ -189,21 +184,21 @@ { assert(m_pSessionsHashTable); assert(m_pSessionsHashTableMutex); - return static_cast<switch_core_session_t*>(switch_core_hash_find_locked(m_pSessionsHashTable,*i_token,m_pSessionsHashTableMutex)); + return static_cast<switch_core_session_t*>(switch_core_hash_find_locked(m_pSessionsHashTable,(const char*)i_token,m_pSessionsHashTableMutex)); } void FSOpalManager::saveSessionToken(PString &i_token,switch_core_session_t* i_session) { assert(m_pSessionsHashTable); assert(m_pSessionsHashTableMutex); - switch_core_hash_insert_locked(m_pSessionsHashTable,*i_token,i_session,m_pSessionsHashTableMutex); + switch_core_hash_insert_locked(m_pSessionsHashTable,(const char*)i_token,i_session,m_pSessionsHashTableMutex); } void FSOpalManager::deleteToken(PString &i_token) { assert(m_pSessionsHashTable); assert(m_pSessionsHashTableMutex); - switch_core_hash_delete_locked(m_pSessionsHashTable,*i_token,m_pSessionsHashTableMutex); + switch_core_hash_delete_locked(m_pSessionsHashTable,(const char*)i_token,m_pSessionsHashTableMutex); } @@ -521,4 +516,4 @@ { assert(m_isInitialized); return SWITCH_STATUS_SUCCESS; -} \ No newline at end of file +} Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/opalh323_backend.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/opalh323_backend.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/opalh323_backend.h Sun Oct 28 17:55:20 2007 @@ -31,6 +31,8 @@ #define __FREESWITCH_OPALH323_BACKEND__ #include <switch.h> +#include <ptlib.h> +#include <opal/buildopts.h> #include <opal/manager.h> #include <h323/h323ep.h> @@ -100,13 +102,13 @@ void deleteToken(PString &i_token); - char *m_pModuleName; /* name of this module */ - bool m_isInitilized; /* true if module has been initialized properly */ - H323EndPoint *m_pH323Endpoint; /* h323 endpoint control */ - switch_memory_pool_t *m_pMemoryPool; /* FS memory pool */ - switch_endpoint_interface_t *m_pEndpointInterface; /* FS endpoint inerface */ - switch_hash_t *m_pSessionsHashTable; /* Stores pointrs to session object for each Opal connection */ - switch_mutex_t *m_pSessionsHashTableMutex; /* Protects hash table */ + const char *m_pModuleName; /* name of this module */ + bool m_isInitialized; /* true if module has been initialized properly */ + H323EndPoint *m_pH323Endpoint; /* h323 endpoint control */ + switch_memory_pool_t *m_pMemoryPool; /* FS memory pool */ + switch_endpoint_interface_t *m_pEndpointInterface; /* FS endpoint inerface */ + switch_hash_t *m_pSessionsHashTable; /* Stores pointrs to session object for each Opal connection */ + switch_mutex_t *m_pSessionsHashTableMutex; /* Protects hash table */ };

1 0

[commit] r6077 - freeswitch/trunk/src/mod/endpoints/mod_opal
by Freeswitch SVN 28 Oct '07

28 Oct '07

Author: lzwierko Date: Sun Oct 28 17:38:18 2007 New Revision: 6077 Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/Makefile.am Log: first makefile, and it seems to be quite ok Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/Makefile.am ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/Makefile.am (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/Makefile.am Sun Oct 28 17:38:18 2007 @@ -14,10 +14,8 @@ OPAL_DIR=$(switch_builddir)/libs/opal -include $(OPAL_DIR)/opal_inc.mak - mod_LTLIBRARIES = mod_opal.la -mod_opal_la_SOURCES = mod_opalh323.cpp opalh323_backend.cpp +mod_opal_la_SOURCES = opalh323_backend.cpp mod_opalh323.cpp mod_opal_la_CFLAGS = $(AM_CFLAGS) mod_opal_la_CFLAGS += -I. -I$(OPAL_DIR)/include mod_opal_la_CPPFLAGS = $(AM_CPPFLAGS) @@ -36,3 +34,5 @@ else \ $(LIBTOOL) --mode=install $(INSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/$(moddir) >/dev/null ; \ fi + +##include $(OPAL_DIR)/opal_inc.mak

1 0

[commit] r6075 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 28 Oct '07

28 Oct '07

Author: mikej Date: Sun Oct 28 12:07:23 2007 New Revision: 6075 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: improve sofia_glue_get_url_from_contact and its usage. Should fix MODENDP-33. 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 Sun Oct 28 12:07:23 2007 @@ -1572,6 +1572,12 @@ } *e = '\0'; + } else { + if (to_dup) { + url = strdup(buf); + } else { + url = buf; + } } return url; 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 Sun Oct 28 12:07:23 2007 @@ -530,16 +530,10 @@ char *sub_to_user = argv[3]; char *sub_to_host = argv[4]; char *event = argv[5]; - char *contact = argv[6]; char *call_id = argv[7]; - //char *full_from = argv[8]; - //char *full_via = argv[9]; - //char *expires = argv[10]; - nua_handle_t *nh; char *to; char *open; - char *tmp; char *prpid; int done = 0; @@ -605,10 +599,6 @@ id, profile->url, open, status, prpid, open, rpid, note); - - tmp = contact; - contact = sofia_glue_get_url_from_contact(tmp, 0); - nua_notify(nh, SIPTAG_SUBSCRIPTION_STATE_STR("active;expires=3600"), SIPTAG_EVENT_STR(event), SIPTAG_CONTENT_TYPE_STR("application/pidf+xml"), SIPTAG_PAYLOAD_STR(pl), TAG_END()); @@ -635,7 +625,7 @@ char *sub_to_user = argv[3]; char *sub_to_host = argv[4]; char *event = argv[5]; - char *contact = argv[6]; + //char *contact = argv[6]; char *call_id = argv[7]; //char *full_from = argv[8]; //char *full_via = argv[9]; @@ -643,7 +633,7 @@ char *body = argv[11]; char *exp; sofia_profile_t *profile = NULL; - char *tmp, *id = NULL; + char *id = NULL; nua_handle_t *nh; int expire_sec = atoi(expires); @@ -664,9 +654,6 @@ } exp = switch_mprintf("active;expires=%ld", expire_sec); - tmp = contact; - contact = sofia_glue_get_url_from_contact(tmp, 0); - nua_notify(nh, SIPTAG_SUBSCRIPTION_STATE_STR(exp), SIPTAG_EVENT_STR(event), SIPTAG_CONTENT_TYPE_STR("application/simple-message-summary"), SIPTAG_PAYLOAD_STR(body), TAG_END()); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Sun Oct 28 12:07:23 2007 @@ -156,18 +156,17 @@ { sofia_profile_t *profile = (sofia_profile_t *) pArg; nua_handle_t *nh; - char *contact; + char *contact = NULL; char to[128] = ""; snprintf(to, sizeof(to), "%s@%s", argv[1], argv[2]); contact = sofia_glue_get_url_from_contact(argv[3], 1); nh = nua_handle(profile->nua, NULL, SIPTAG_FROM_STR(profile->url), SIPTAG_TO_STR(to), NUTAG_URL(contact), SIPTAG_CONTACT_STR(profile->url), TAG_END()); - - //nua_message(nh, SIPTAG_CONTENT_TYPE_STR("text/plain"), - //SIPTAG_PAYLOAD_STR("You suffer from Connectile Dysfunction.\nYou should use stun....\n"), TAG_END()); nua_options(nh, TAG_END()); + + switch_safe_free(contact); return 0; }

1 0

[commit] r6074 - freeswitch/trunk/scripts/contrib/trixter
by Freeswitch SVN 28 Oct '07

28 Oct '07

Author: trixter Date: Sun Oct 28 11:04:43 2007 New Revision: 6074 Added: freeswitch/trunk/scripts/contrib/trixter/gcccpuopt (contents, props changed) Log: script (not written by me, read comments) that on at least x86 linux|FBSD will tell you the best options for optimization based on your *installed* compiler and will inform you that newer compilers may provide better options Added: freeswitch/trunk/scripts/contrib/trixter/gcccpuopt ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/trixter/gcccpuopt Sun Oct 28 11:04:43 2007 @@ -0,0 +1,257 @@ +#!/bin/sh + +# Print the gcc cpu specific options appropriate for the current CPU + +# Author: +# http://www.pixelbeat.org/ +# Notes: +# This script currently supports Linux,FreeBSD +# This script is x86 (32 bit) specific +# It should work on any gcc >= 2.95 at least +# It only returns CPU specific options. You probably also want -03 etc. +# Changes: +# V0.1, 12 Mar 2003, Initial release +# V0.2, 01 Jun 2005, Added support for 3.2>=gcc<=4.0 +# V0.3, 03 Jun 2005, Added support for pentium-m +# V0.4, 03 Jun 2005, Fix silly bugs +# V0.5, 07 Jun 2005, Clarify/Simplify confusing floating point expr usage +# Print warning when CPU only supported on a newer gcc +# V0.6, 15 Dec 2006, Added support for Intel Core and Core 2 processors +# Added support for 4.1>=gcc<=4.3 +# Added support for gcc -msse3 option +# Added support for new gcc -march=native option +# V0.7, 18 Dec 2006, Changes from Conor McDermottroe +# Added support for FreeBSD +# Remove bash specific constructs +# Better error handling +# V0.8, 19 Dec 2006, Give warnings and 32 bit -march on 64 bit platforms. +# Previously it just gave an invalid blank -march. +# Reported and tested by Ewan Oughton. +# V0.9, 30 Apr 2007, Give error if compiler not present. +# Warn about rather than default to -march=native option. + +if [ "$1" = "--version" ]; then + echo "0.9" && exit +fi + +# This table shows when -march options were introduced into _official_ gcc releases. +# Note there are vendor deviations that complicate this. +# For e.g. redhat introduced the prescott option in 3.3-13. +# gcc-2.95 = i386, i486, i586,pentium, i686,pentiumpro, k6 +# gcc-3.0 += athlon +# gcc-3.1 += pentium-mmx, pentium2, pentium3, pentium4, k6-2, k6-3, athlon-{tbird, 4,xp,mp} +# gcc-3.3 += winchip-c6, winchip2, c3 +# gcc-3.4.0 += k8,opteron,athlon64,athlon-fx, c3-2 +# gcc-3.4.1 += pentium-m, pentium3m, pentium4m, prescott, nocona +# gcc-4.3 += core2 + +[ -z "$CC" ] && CC=gcc + +try_gcc_options() { + $CC $* -S -o /dev/null -xc /dev/null >/dev/null 2>&1 +} + +if ! try_gcc_options; then + echo "Error: Couldn't execute your compiler ($CC)" >&2 + exit 1 +fi + +if try_gcc_options -march=native; then + echo "Warning: Your compiler supports the -march=native option which you may prefer" >&2 +fi + +if ! try_gcc_options -march=i386; then + if ! try_gcc_options -m32 -march=i386; then + echo "Error: This script only supports 32 bit x86 architectures" >&2 + exit 1 + else + echo "Warning: The optimum *32 bit* architecture is reported" >&2 + m32="-m32 " + fi +fi + +try_line() { + skip=0 + for arch in $1; do + if try_gcc_options $m32 -march=$arch; then + echo $arch + return + elif [ "$skip" = "0" ] && [ "$arch" != "native" ]; then + skip=1 + echo "Warning: Newer versions of GCC better support your CPU with -march=$arch" >&2 + fi + done + return 1 +} + +read_cpu_data_linux() { + IFS=":" + while read name value; do + unset IFS + name=`echo $name` + value=`echo $value` + IFS=":" + if [ "$name" = "vendor_id" ]; then + vendor_id="$value" + elif [ "$name" = "cpu family" ]; then + cpu_family="$value" + elif [ "$name" = "model" ]; then + cpu_model="$value" + elif [ "$name" = "flags" ]; then + flags="$value" + break #flags last so break early + fi + done < /proc/cpuinfo + unset IFS +} + +read_cpu_data_freebsd() { + local _line + + if [ ! -x /usr/local/bin/cpuid ]; then + echo "Please install misc/cpuid and run again" + exit 1; + fi + if [ ! -r /var/run/dmesg.boot ]; then + echo "/var/run/dmesg.boot does not exist!" + exit 1; + fi + + # Get the vendor_id, cpu_family and cpu_model from cpuid + IFS=" +" + for _line in `/usr/local/bin/cpuid`; do + if [ -n "`echo $_line | grep '^Vendor ID: '`" ]; then + vendor_id="`echo $_line | cut -d'"' -f2`" + fi + if [ -n "`echo $_line | grep '^Family: '`" ]; then + cpu_family="`echo $_line | sed -e 's/Family: //' -e 's/ .*//'`" + fi + if [ -n "`echo $_line | grep '^Family: '`" ]; then + cpu_model="`echo $_line | sed -e 's/Family:.*Model: //' -e 's/ .*//'`" + fi + done + unset IFS + + # Get the flags from /var/run/dmesg.boot + flags="`grep -A2 '^CPU:' /var/run/dmesg.boot | grep '^ Features' | sed -e 's/^.*<//' -e 's/>.*//' -e 's/,/ /g' | tr 'A-Z' 'a-z'`" +} + +read_cpu_data() { + # Default values + vendor_id="Unset" + cpu_family="-1" + cpu_model="-1" + flags="" + if [ "`uname`" = "Linux" ]; then + read_cpu_data_linux + elif [ "`uname`" = "FreeBSD" ]; then + read_cpu_data_freebsd + else + echo "Error: `uname` is not a supported operating system" + exit 1 + fi +} + +read_cpu_data + +if [ "$vendor_id" = "AuthenticAMD" ]; then + if [ $cpu_family -eq 4 ]; then + _CFLAGS="-march=i486" + elif [ $cpu_family -eq 5 ]; then + if [ $cpu_model -lt 4 ]; then + _CFLAGS="-march=pentium" + elif [ $ $cpu_model -eq 6 $ -o $ $cpu_model -eq 7 $ ]; then + _CFLAGS="-march=k6" + elif [ $ $cpu_model -eq 8 $ -o $ $cpu_model -eq 12 $ ]; then + line="k6-2 k6" + elif [ $ $cpu_model -eq 9 $ -o $ $cpu_model -eq 13 $ ]; then + line="k6-3 k6-2 k6" + fi + elif [ $cpu_family -eq 6 ]; then + if [ $cpu_model -le 3 ]; then + line="athlon k6-3 k6-2 k6" + elif [ $cpu_model -eq 4 ]; then + line="athlon-tbird athlon k6-3 k6-2 k6" + elif [ $cpu_model -ge 6 ]; then #athlon-{4,xp,mp} + line="athlon-4 athlon k6-3 k6-2 k6" + fi + elif [ $cpu_family -eq 15 ]; then #k8,opteron,athlon64,athlon-fx + line="k8 athlon-4 athlon k6-3 k6-2 k6" + fi +elif [ "$vendor_id" = "CentaurHauls" ]; then + if [ $cpu_family -eq 5 ]; then + if [ $cpu_model -eq 4 ]; then + line="winchip-c6 pentium" + elif [ $cpu_model -eq 8 ]; then + line="winchip2 winchip-c6 pentium" + elif [ $cpu_model -ge 9 ]; then + line="winchip2 winchip-c6 pentium" #actually winchip3 but gcc doesn't support this currently + fi + elif [ $cpu_family -eq 6 ]; then + if echo "$flags" | grep -q cmov; then + fallback=pentiumpro + else + fallback=pentium #gcc incorrectly assumes i686 always has cmov + fi + if [ $cpu_model -eq 6 ]; then + _CFLAGS="-march=pentium" # ? Cyrix 3 (samuel) + elif [ $cpu_model -eq 7 ] || [ $cpu_model -eq 8 ]; then + line="c3 winchip2 winchip-c6 $fallback" + elif [ $cpu_model -ge 9 ]; then + line="c3-2 c3 winchip2 winchip-c6 $fallback" + fi + fi +elif [ "$vendor_id" = "GenuineIntel" ]; then + if [ $cpu_family -eq 3 ]; then + _CFLAGS="-march=i386" + elif [ $cpu_family -eq 4 ]; then + _CFLAGS="-march=i486" + elif [ $cpu_family -eq 5 ]; then + if [ $cpu_model -ne 4 ]; then + _CFLAGS="-march=pentium" + else + line="pentium-mmx pentium" #No overlap with other vendors + fi + elif [ $cpu_family -eq 6 ]; then + if [ $ $cpu_model -eq 0 $ -o $ $cpu_model -eq 1 $ ]; then + _CFLAGS="-march=pentiumpro" + elif [ $ $cpu_model -ge 3 $ -a $ $cpu_model -le 6 $ ]; then #4=TM5600 at least + line="pentium2 pentiumpro pentium-mmx pentium i486 i386" + elif [ $ $cpu_model -eq 9 $ -o $ $cpu_model -eq 13 $ ]; then #centrino + line="pentium-m pentium4 pentium3 pentium2 pentiumpro pentium-mmx pentium i486 i386" + elif [ $cpu_model -eq 14 ]; then #Core + line="prescott pentium-m pentium4 pentium3 pentium2 pentiumpro pentium-mmx pentium i486 i386" + elif [ $cpu_model -eq 15 ]; then #Core 2 + line="core2 pentium-m pentium4 pentium3 pentium2 pentiumpro pentium-mmx pentium i486 i386" + elif [ $ $cpu_model -ge 7 $ -a $ $cpu_model -le 11 $ ]; then + line="pentium3 pentium2 pentiumpro pentium-mmx pentium i486 i386" + fi + elif [ $cpu_family -eq 15 ]; then + if [ $cpu_model -eq 3 ]; then + line="prescott pentium4 pentium3 pentium2 pentiumpro pentium-mmx pentium i486 i386" + else + line="pentium4 pentium3 pentium2 pentiumpro pentium-mmx pentium i486 i386" + fi + fi +else + echo "Unknown CPU Vendor: $vendor_id" + exit 1 +fi + +[ -z "$_CFLAGS" ] && _CFLAGS="-march=`try_line "$line"`" + +if echo "$flags" | grep -q "sse"; then + if try_gcc_options "-mfpmath=sse"; then #gcc >= 3.1 + _CFLAGS="$_CFLAGS -mfpmath=sse" + fi +fi +if echo "$flags" | grep -E -q "(sse3|pni)"; then + if ! echo "$_CFLAGS" | grep -E -q "(native|core2)"; then + if try_gcc_options "-msse3"; then #gcc >= 3.3.3 + _CFLAGS="$_CFLAGS -msse3" + fi + fi +fi + +echo "$m32$_CFLAGS"

1 0

[commit] r6073 - freeswitch/trunk/src/mod/endpoints/mod_opal
by Freeswitch SVN 28 Oct '07

28 Oct '07

Author: lzwierko Date: Sun Oct 28 09:21:56 2007 New Revision: 6073 Added: freeswitch/trunk/src/mod/endpoints/mod_opal/Makefile.am Log: Added: freeswitch/trunk/src/mod/endpoints/mod_opal/Makefile.am ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/Makefile.am Sun Oct 28 09:21:56 2007 @@ -0,0 +1,38 @@ +AM_CFLAGS = $(SWITCH_AM_CFLAGS) +AM_CPPFLAGS = $(SWITCH_AM_CXXFLAGS) +AM_LDFLAGS = $(SWITCH_AM_LDFLAGS) +#we should set all these vars from configure, no reason to have these in each Makefile.am +LIBTOOL = echo "`link=\`echo $@|grep .la;echo $@|grep .so;echo $@|grep .dll\`;if test -n "$$link"; then echo Creating $@;fi`";`if test -z "$(VERBOSE)" ; \ +then echo $(SHELL) $(switch_builddir)/quiet_libtool ;else echo $(SHELL) $(switch_builddir)/libtool; fi` +AM_MAKEFLAGS=`test -n "$(VERBOSE)" || echo -s` +# Dirty trick to override the link output +LIBS+=> $(MODNAME).log || error="yes";if test -n "$(VERBOSE)" -o "$$error" = "yes";then cat $(MODNAME).log;fi;if test "$$error" = "yes";then exit 1;fi + +moddir=$(prefix)/mod + +MODNAME=mod_opal + +OPAL_DIR=$(switch_builddir)/libs/opal + +include $(OPAL_DIR)/opal_inc.mak + +mod_LTLIBRARIES = mod_opal.la +mod_opal_la_SOURCES = mod_opalh323.cpp opalh323_backend.cpp +mod_opal_la_CFLAGS = $(AM_CFLAGS) +mod_opal_la_CFLAGS += -I. -I$(OPAL_DIR)/include +mod_opal_la_CPPFLAGS = $(AM_CPPFLAGS) +mod_opal_la_CPPFLAGS += -I. -I$(OPAL_DIR)/include +mod_opal_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_opal_la_LDFLAGS = -avoid-version -module -no-undefined + +#Override the linstall target so we just install the .so/.dylib + +install-data-am: $(DESTDIR)$(PREFIX)/$(moddir)/$(MODNAME).$(DYNAMIC_LIB_EXTEN) + +$(DESTDIR)$(PREFIX)/$(moddir)/$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).la + @echo installing $(MODNAME).$(DYNAMIC_LIB_EXTEN) + @if [ -f .libs/$(MODNAME).$(DYNAMIC_LIB_EXTEN) ] ; then \ + $(LIBTOOL) --mode=install $(INSTALL) .libs/$(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/$(moddir) >/dev/null ; \ + else \ + $(LIBTOOL) --mode=install $(INSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/$(moddir) >/dev/null ; \ + fi

1 0

[commit] r6072 - freeswitch/trunk/src/mod/endpoints/mod_opal
by Freeswitch SVN 28 Oct '07

28 Oct '07

Author: lzwierko Date: Sun Oct 28 08:32:31 2007 New Revision: 6072 Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opalh323.cpp freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opalh323.h freeswitch/trunk/src/mod/endpoints/mod_opal/opalh323_backend.h Log: Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opalh323.cpp ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opalh323.cpp (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opalh323.cpp Sun Oct 28 08:32:31 2007 @@ -32,7 +32,7 @@ #include "mod_opalh323.h" -#inlcude "opalh323_backend.h" +#include "opalh323_backend.h" #include <switch.h> /* @@ -100,12 +100,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_opalh323_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_opalh323_shutdown); SWITCH_MODULE_DEFINITION(mod_opalh323, mod_opalh323_load, mod_opalh323_shutdown, NULL); - -/* - * Pointer to endpoint interface descriptor for this module - */ -switch_endpoint_interface_t *opalh323_endpoint_interface; - /* * This function is called on module load @@ -126,7 +120,7 @@ { return SWITCH_STATUS_MEMERR; } - opalh323_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE); + opalh323_endpoint_interface = (switch_endpoint_interface_t*)switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE); opalh323_endpoint_interface->interface_name = "OPALH323"; opalh323_endpoint_interface->io_routines = &opalh323_io_routines; opalh323_endpoint_interface->state_handler = &opalh323_event_handlers; @@ -139,7 +133,7 @@ return SWITCH_STATUS_MEMERR; } - if(!opalh323_manager->initialize(pool)) + if(!opalh323_manager->initialize(modname,pool,opalh323_endpoint_interface)) { delete opalh323_manager; return SWITCH_STATUS_FALSE; /* if can't initialize return general error */ @@ -181,7 +175,7 @@ static switch_status_t opalh323_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout, switch_io_flag_t flags, int stream_id) { - return opalh323_manager->io_write_frame(session,frame,timeout,flag,stream_id); + return opalh323_manager->io_write_frame(session,frame,timeout,flags,stream_id); } static switch_status_t opalh323_kill_channel(switch_core_session_t *session, int sig) @@ -196,7 +190,7 @@ static switch_status_t opalh323_waitfor_write(switch_core_session_t *session, int ms, int stream_id) { - return opalh323_manager->io_waitfor_write(session,ms,sream_id); + return opalh323_manager->io_waitfor_write(session,ms,stream_id); } static switch_status_t opalh323_send_dtmf(switch_core_session_t *session, char *dtmf) @@ -224,9 +218,9 @@ return opalh323_manager->io_read_video_frame(session,frame,timeout,flag,stream_id); } -static switch_status_t opalh323_write_video_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout, switch_io_flag_t flag, int stream_id) +static switch_status_t opalh323_write_video_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout, switch_io_flag_t flag, int stream_id) { - return opalh323_manager->io_write_vidoe_frame(session,frame,timeout,flag,stream_id); + return opalh323_manager->io_write_video_frame(session,frame,timeout,flag,stream_id); } /* Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opalh323.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opalh323.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opalh323.h Sun Oct 28 08:32:31 2007 @@ -36,4 +36,4 @@ -#endif /* __FREESWITCH_MOD_OPALH323__ */ \ No newline at end of file +#endif /* __FREESWITCH_MOD_OPALH323__ */ Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/opalh323_backend.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/opalh323_backend.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/opalh323_backend.h Sun Oct 28 08:32:31 2007 @@ -32,11 +32,7 @@ #include <switch.h> #include <opal/manager.h> -#include <opal/endpoint.h> -#include <opal/mediastrm.h> - - -class H323EndPoint; +#include <h323/h323ep.h> /** This class is OpalManager implementation * for FreeSWITCH OpalH323 module. @@ -64,9 +60,9 @@ * Method does real initialization of the manager */ bool initialize( - const char* i_modName + const char* i_modName, switch_memory_pool_t* i_memoryPool, - switch_endpoint_interface_t *i_endpointInterface, + switch_endpoint_interface_t *i_endpointInterface ); /** FS callback handlers declarations @@ -106,7 +102,7 @@ char *m_pModuleName; /* name of this module */ bool m_isInitilized; /* true if module has been initialized properly */ - H323Endpoint *m_pH323Endpoint; /* h323 endpoint control */ + H323EndPoint *m_pH323Endpoint; /* h323 endpoint control */ switch_memory_pool_t *m_pMemoryPool; /* FS memory pool */ switch_endpoint_interface_t *m_pEndpointInterface; /* FS endpoint inerface */ switch_hash_t *m_pSessionsHashTable; /* Stores pointrs to session object for each Opal connection */

1 0

[commit] r6071 - freeswitch/trunk/src/mod/endpoints/mod_opal
by Freeswitch SVN 27 Oct '07

27 Oct '07

Author: lzwierko Date: Sat Oct 27 18:01:11 2007 New Revision: 6071 Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/opalh323_backend.cpp freeswitch/trunk/src/mod/endpoints/mod_opal/opalh323_backend.h Log: Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/opalh323_backend.cpp ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/opalh323_backend.cpp (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/opalh323_backend.cpp Sat Oct 27 18:01:11 2007 @@ -184,6 +184,29 @@ } + +switch_core_session_t* FSOpalManager::getSessionToken(PString &i_token) +{ + assert(m_pSessionsHashTable); + assert(m_pSessionsHashTableMutex); + return static_cast<switch_core_session_t*>(switch_core_hash_find_locked(m_pSessionsHashTable,*i_token,m_pSessionsHashTableMutex)); +} + +void FSOpalManager::saveSessionToken(PString &i_token,switch_core_session_t* i_session) +{ + assert(m_pSessionsHashTable); + assert(m_pSessionsHashTableMutex); + switch_core_hash_insert_locked(m_pSessionsHashTable,*i_token,i_session,m_pSessionsHashTableMutex); +} + +void FSOpalManager::deleteToken(PString &i_token) +{ + assert(m_pSessionsHashTable); + assert(m_pSessionsHashTableMutex); + switch_core_hash_delete_locked(m_pSessionsHashTable,*i_token,m_pSessionsHashTableMutex); +} + + BOOL FSOpalManager::OnIncomingConnection( OpalConnection & connection, ///< Connection that is calling unsigned options, ///< options for new connection (can't use default as overrides will fail) @@ -240,7 +263,7 @@ */ switch_mutex_lock(tech_pvt->m_mutex); /** insert connection to hash table */ - switch_core_hash_insert_locked(m_pSessionsHashTable,*(connection.GetToken()),static_cast<void*>(session)); ///save pointer to session in hash table, for later retreival + saveSessionToken(connection.GetToken(),session); ///save pointer to session in hash table, for later retreival /** Create calling side profile */ tech_pvt->m_callerProfile = switch_caller_profile_new( @@ -260,7 +283,7 @@ if(!tech_pvt->m_callerProfile) /* should never error */ { - switch_core_hash_delete_locked(m_pSessionsHashTable,*(connection.GetToken())); + deleteSessionToken(connection.GetToken()); switch_mutex_unlock(tech_pvt->m_mutex); OpalH323Private_Delete(tech_pvt); switch_core_session_destroy(&session); @@ -284,7 +307,7 @@ if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n"); - switch_core_hash_delete_locked(m_pSessionsHashTable,*(connection.GetToken())); + deleteSessionToken(connection.GetToken()); switch_mutex_unlock(tech_pvt->m_mutex); OpalH323Private_Delete(tech_pvt); switch_core_session_destroy(&session); @@ -411,6 +434,68 @@ switch_status_t FSOpalManager::io_receive_message(switch_core_session_t *i_session, switch_core_session_message_t *i_message) { assert(m_isInitialized); + + OpalH323Private_t* tech_prv = switch_core_session_get_private(i_session); + assert(tech_prv); + + switch_mutex_lock(tech_prv->m_mutex); + + switch(i_message->message_id) + { + case SWITCH_MESSAGE_REDIRECT_AUDIO: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_REDIRECT_AUDIO\n"); + break; + case SWITCH_MESSAGE_TRANSMIT_TEXT: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_TRANSMIT_TEXT\n"); + break; + case SWITCH_MESSAGE_INDICATE_ANSWER: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_ANSWER\n"); + + /* set call answer */ + tech_prv->m_opalConnection->AnsweringCall(AnswerCallNow); + break; + case SWITCH_MESSAGE_INDICATE_PROGRESS: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_PROGRESS\n"); + break; + case SWITCH_MESSAGE_INDICATE_BRIDGE: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_BRIDGE\n"); + break; + case SWITCH_MESSAGE_INDICATE_UNBRIDGE: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_UNBRIDGE\n"); + break; + case SWITCH_MESSAGE_INDICATE_TRANSFER: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_TRANSFER\n"); + break; + case SWITCH_MESSAGE_INDICATE_RINGING: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_RINGING\n"); + break; + case SWITCH_MESSAGE_INDICATE_MEDIA: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_MEDIA\n"); + break; + case SWITCH_MESSAGE_INDICATE_NOMEDIA: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_NOMEDIA\n"); + break; + case SWITCH_MESSAGE_INDICATE_HOLD: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_HOLD\n"); + break; + case SWITCH_MESSAGE_INDICATE_UNHOLD: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_UNHOLD\n"); + break; + case SWITCH_MESSAGE_INDICATE_REDIRECT: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_REDIRECT\n"); + break; + case SWITCH_MESSAGE_INDICATE_REJECT: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_REJECT\n"); + break; + case SWITCH_MESSAGE_INDICATE_BROADCAST: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_BROADCAST\n"); + break; + case SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT\n"); + break; + } + + switch_mutex_unlock(tech_prv->m_mutex); return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/opalh323_backend.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/opalh323_backend.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/opalh323_backend.h Sat Oct 27 18:01:11 2007 @@ -99,6 +99,11 @@ private: + void saveSessionToken(PString &i_token,switch_core_session_t* i_session); + switch_core_session_t* getSessionToken(PString &i_token); + void deleteToken(PString &i_token); + + char *m_pModuleName; /* name of this module */ bool m_isInitilized; /* true if module has been initialized properly */ H323Endpoint *m_pH323Endpoint; /* h323 endpoint control */

1 0