February 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7518 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 04 Feb '08

04 Feb '08

Author: mikej Date: Mon Feb 4 14:01:22 2008 New Revision: 7518 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: tweak 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 Mon Feb 4 14:01:22 2008 @@ -124,7 +124,9 @@ switch_hash_index_t *hi; void *val; struct presence_helper helper = { 0 }; - + + if (!mod_sofia_globals.profile_hash) return; + if ((sql = switch_mprintf("select *,-1,'unavailable','unavailable' from sip_subscriptions where event='presence'"))) { switch_mutex_lock(mod_sofia_globals.hash_mutex); for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { @@ -319,6 +321,8 @@ if (event->event_id == SWITCH_EVENT_ROSTER) { struct presence_helper helper = { 0 }; + + if (!mod_sofia_globals.profile_hash) return; if (from) { sql = switch_mprintf("select *,1,'%q','%q' from sip_subscriptions where event='presence' and full_from like '%%%q%%'", status, rpid, from); @@ -433,6 +437,8 @@ break; } + if (!mod_sofia_globals.profile_hash) goto done; + switch_mutex_lock(mod_sofia_globals.hash_mutex); for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, NULL, NULL, &val); @@ -463,6 +469,7 @@ } switch_mutex_unlock(mod_sofia_globals.hash_mutex); +done: switch_safe_free(sql); switch_safe_free(user); }

1 0

[commit] r7517 - freeswitch/trunk/src/mod/loggers/mod_console
by Freeswitch SVN 04 Feb '08

04 Feb '08

Author: brian Date: Mon Feb 4 13:23:51 2008 New Revision: 7517 Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Log: clean up Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Mon Feb 4 13:23:51 2008 @@ -138,8 +138,7 @@ #else COLORIZE = 1; #endif - } - if (!strcasecmp(var, "loglevel")) { + } else if (!strcasecmp(var, "loglevel")) { hard_log_level = switch_log_str2level(val); } }

1 0

[commit] r7516 - in freeswitch/trunk: conf/autoload_configs src/mod/loggers/mod_console
by Freeswitch SVN 04 Feb '08

04 Feb '08

Author: brian Date: Mon Feb 4 13:22:29 2008 New Revision: 7516 Modified: freeswitch/trunk/conf/autoload_configs/console.conf.xml freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Log: add default loglevel for mod_console Modified: freeswitch/trunk/conf/autoload_configs/console.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/console.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/console.conf.xml Mon Feb 4 13:22:29 2008 @@ -11,5 +11,6 @@ <settings>  <param name="colorize" value="true"/> + <param name="loglevel" value="info"/> </settings> </configuration> Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Mon Feb 4 13:22:29 2008 @@ -139,6 +139,9 @@ COLORIZE = 1; #endif } + if (!strcasecmp(var, "loglevel")) { + hard_log_level = switch_log_str2level(val); + } } }

1 0

[commit] r7515 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 04 Feb '08

04 Feb '08

Author: brian Date: Mon Feb 4 12:43:12 2008 New Revision: 7515 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: don't offer secure media on enum calls Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Mon Feb 4 12:43:12 2008 @@ -274,6 +274,7 @@ <extension name="enum"> <condition field="destination_number" expression="^(.*)$"> + <action application="unset" data="sip_secure_media"/> <action application="transfer" data="$1 enum"/> </condition> </extension>

1 0

[commit] r7514 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 04 Feb '08

04 Feb '08

Author: brian Date: Mon Feb 4 12:06:43 2008 New Revision: 7514 Modified: freeswitch/trunk/conf/autoload_configs/console.conf.xml Log: this isn't the behavior I wanted Modified: freeswitch/trunk/conf/autoload_configs/console.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/console.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/console.conf.xml Mon Feb 4 12:06:43 2008 @@ -6,7 +6,7 @@ name can be a file name, function name or 'all' value is one or more of debug,info,notice,warning,err,crit,alert,all --> - <map name="all" value="info,notice,warning,err,crit,alert"/> + <map name="all" value="debug,info,notice,warning,err,crit,alert"/> </mappings> <settings>

1 0

[commit] r7513 - freeswitch/trunk
by Freeswitch SVN 04 Feb '08

04 Feb '08

Author: cypromis Date: Mon Feb 4 09:16:53 2008 New Revision: 7513 Modified: freeswitch/trunk/freeswitch.spec Log: Works now except for the openzap makefile bug which I can't change. RPATH fixes thanks to puzzled Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Mon Feb 4 09:16:53 2008 @@ -171,9 +171,15 @@ %setup -q %build +%ifos linux %if 0%{?suse_version} > 1000 && 0%{?suse_version} < 1030 export CFLAGS="$CFLAGS -fstack-protector" %endif +%if 0%{?fedora_version} >= 8 +export QA_RPATHS=$[ 0x0001|0x0002 ] +%endif +%endif + PASSTHRU_CODEC_MODULES="codecs/mod_g729 codecs/mod_g723_1 codecs/mod_amr" SPIDERMONKEY_MODULES="languages/mod_spidermonkey languages/mod_spidermonkey_curl languages/mod_spidermonkey_core_db languages/mod_spidermonkey_odbc languages/mod_spidermonkey_socket languages/mod_spidermonkey_teletone" APPLICATIONS_MODULES="applications/mod_commands applications/mod_conference applications/mod_dptools applications/mod_enum applications/mod_esf applications/mod_expr applications/mod_fifo applications/mod_limit applications/mod_rss applications/mod_voicemail"

1 0

[commit] r7512 - freeswitch/trunk
by Freeswitch SVN 04 Feb '08

04 Feb '08

Author: cypromis Date: Mon Feb 4 08:07:08 2008 New Revision: 7512 Modified: freeswitch/trunk/freeswitch.spec Log: Works now everywhere but openSuse 10.3, mandirva and fedora8 ..... life is hard and full of bugs Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Mon Feb 4 08:07:08 2008 @@ -73,9 +73,9 @@ Our developers are heavily involved in open source and have donated code and other resources to other telephony projects including sipXecs, OpenSER, Asterisk, CodeWeaver and OpenPBX. -%if 0%{?suse_version} > 100 -%debug_package -%endif +#%if 0%{?suse_version} > 100 +#%debug_package +#%endif %package devel Summary: Development package for FreeSWITCH open source telephony platform @@ -187,9 +187,9 @@ FORMATS_MODULES="formats/mod_local_stream formats/mod_native_file formats/mod_sndfile" LANGUAGES_MODULES= LOGGERS_MODULES="loggers/mod_console loggers/mod_logfile loggers/mod_syslog" -SAY_MODULES="say/mod_say_en" +SAY_MODULES="say/mod_say_en say/mod_say_fr say/mod_say_de" TIMERS_MODULES= -DISABLED_MODULES="applications/mod_sountouch directories/mod_ldap languages/mod_java languages/mod_python languages/mod_spidermonkey_skel ast_tts/mod_cepstral asr_tts/mod_lumenvox endpoints/mod_wanpipe event_handlers/mod_event_test event_handlers/mod_radius_cdr event_handlers/mod_zeroconf formats/mod_shout say/mod_say_it say/mod_say_es say/mod_say_nl say/mod_say_fr say/mod_say_de" +DISABLED_MODULES="applications/mod_sountouch directories/mod_ldap languages/mod_java languages/mod_python languages/mod_spidermonkey_skel ast_tts/mod_cepstral asr_tts/mod_lumenvox endpoints/mod_wanpipe event_handlers/mod_event_test event_handlers/mod_radius_cdr event_handlers/mod_zeroconf formats/mod_shout say/mod_say_it say/mod_say_es say/mod_say_nl" XML_INT_MODULES="xml_int/mod_xml_rpc xml_int/mod_xml_curl xml_int/mod_xml_cdr" MYMODULES="$PASSTHRU_CODEC_MODULES $SPIDERMONKEY_MODULES $APPLICATIONS_MODULES $ASR_TTS_MODULES $CODECS_MODULES $DIALPLANS_MODULES $DIRECTORIES_MODULES $DOTNET_MODULES $ENDPOINTS_MODULES $EVENT_HANDLERS_MODULES $FORMATS_MODULES $LANGUAGES_MODULES $LOGGERS_MODULES $SAY_MODULES $TIMERS_MODULES $XML_INT_MODULES" @@ -212,7 +212,7 @@ --enable-core-libedit-support \ --enable-core-odbc-support \ %ifos linux -%if 0{?fedora_version} >= 8 +%if 0%{?fedora_version} >= 8 %else --with-libcurl \ %endif @@ -224,7 +224,7 @@ cat src/include/switch_version.h.in | sed "s/@SVN_VERSION@/%{version}/g" > src/include/switch_version.h touch .noversion -make +%{__make} %install %{__make} DESTDIR=$RPM_BUILD_ROOT install @@ -247,7 +247,7 @@ # On SuSE make /usr/sbin/rcfreeswitch a link to /etc/init.d/freeswitch %if 0%{?suse_version} > 100 %{__mkdir} -p $RPM_BUILD_ROOT/usr/sbin -%{__ln} -sf /etc/init.d/freeswitch $RPM_BUILD_ROOT/usr/sbin/rcfreeswitch +%{__ln_s} -f /etc/init.d/freeswitch $RPM_BUILD_ROOT/usr/sbin/rcfreeswitch %endif # Add the sysconfiguration file %{__install} -D -m 744 build/freeswitch.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/freeswitch @@ -264,7 +264,7 @@ %{?run_ldconfig:%run_ldconfig} # Make FHS2.0 happy %{__mkdir} -p /etc/opt -%{__ln} -sf %{prefix}/conf /etc%{prefix} +%{__ln_s} -f %{prefix}/conf /etc%{prefix} %postun %{?run_ldconfig:%run_ldconfig} @@ -482,7 +482,10 @@ %{prefix}/mod/mod_say_fr.so* %changelog -* Sun Fri 03 2008 - michal.bielicki(a)voiceworks.pl +* Mon Feb 04 2008 - michal.bielicki(a)voiceworks.pl +- More fixes to specfile +- First go at SFE files +* Sun Feb 03 2008 - michal.bielicki(a)voiceworks.pl - abstraction of prefix - more wrong stuff deleted - abstraction of mkdir, mv, rm, install etc into macros

1 0

[commit] r7511 - freeswitch/trunk
by Freeswitch SVN 04 Feb '08

04 Feb '08

Author: cypromis Date: Sun Feb 3 22:54:13 2008 New Revision: 7511 Modified: freeswitch/trunk/freeswitch.spec Log: another typo in the spec file :) Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Sun Feb 3 22:54:13 2008 @@ -212,7 +212,7 @@ --enable-core-libedit-support \ --enable-core-odbc-support \ %ifos linux -%if 0{fedora_version} >= 8 +%if 0{?fedora_version} >= 8 %else --with-libcurl \ %endif

1 0

[commit] r7510 - freeswitch/trunk
by Freeswitch SVN 04 Feb '08

04 Feb '08

Author: cypromis Date: Sun Feb 3 22:51:37 2008 New Revision: 7510 Modified: freeswitch/trunk/freeswitch.spec Log: stupid mistajes in definitions :( Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Sun Feb 3 22:51:37 2008 @@ -1,5 +1,5 @@ -define %{_prefix} /opt/freeswitch -define %{prefix} %{_prefix} +%define _prefix /opt/freeswitch +%define prefix %{_prefix} Name: freeswitch Summary: FreeSWITCH open source telephony platform

1 0

[commit] r7509 - freeswitch/trunk/src/mod/xml_int/mod_xml_ldap
by Freeswitch SVN 04 Feb '08

04 Feb '08

Author: jskopis Date: Sun Feb 3 22:50:45 2008 New Revision: 7509 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/mod_xml_ldap.c Log: Added patch from stkn__ to cleanup code. Thanks stkn__ Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/mod_xml_ldap.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/mod_xml_ldap.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/mod_xml_ldap.c Sun Feb 3 22:50:45 2008 @@ -1,4 +1,4 @@ -/* +/* * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> * @@ -22,12 +22,12 @@ * the Initial Developer. All Rights Reserved. * * Contributor(s): - * - * Anthony Minessale II <anthmct(a)yahoo.com> + * + * Anthony Minessale II <anthmct(a)yahoo.com> * Bret McDanel <trixter AT 0xdecafbad.com> * Justin Cassidy <xachenant(a)hotmail.com> * John Skopis <john+fs(a)skopis.com> - * + * * mod_xml_ldap.c -- LDAP XML Gateway * */ @@ -44,45 +44,47 @@ #include <ldap.h> #endif -#define XML_LDAP_CONFIG 0 -#define XML_LDAP_DIRECTORY 1 -#define XML_LDAP_DIALPLAN 2 -#define XML_LDAP_PHRASE 3 +typedef enum { + XML_LDAP_CONFIG = 0, + XML_LDAP_DIRECTORY, + XML_LDAP_DIALPLAN, + XML_LDAP_PHRASE +} xml_ldap_query_type_t; SWITCH_MODULE_LOAD_FUNCTION(mod_xml_ldap_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_ldap_shutdown); SWITCH_MODULE_DEFINITION(mod_xml_ldap, mod_xml_ldap_load, mod_xml_ldap_shutdown, NULL); - struct xml_binding { - char *bindings; - char *host; + char *bindings; + char *host; char *ldap_base; - char *binddn; - char *bindpass; - char *queryfmt; + char *binddn; + char *bindpass; + char *queryfmt; }; typedef struct xml_binding xml_binding_t; struct ldap_c { - LDAP *ld; - LDAPMessage *msg; - LDAPMessage *entry; - BerElement *berkey; - BerElement *berval; - char *key; - char *val; - char **keyvals; - char **valvals; + LDAP *ld; + LDAPMessage *msg; + LDAPMessage *entry; + BerElement *berkey; + BerElement *berval; + char *key; + char *val; + char **keyvals; + char **valvals; }; -static switch_status_t xml_ldap_directory_result( void *ldap_connection, xml_binding_t *binding, switch_xml_t *xml, int *off); -static switch_status_t xml_ldap_dialplan_result( void *ldap_connection, xml_binding_t *binding, switch_xml_t *xml, int *off); +static switch_status_t xml_ldap_directory_result(void *ldap_connection, xml_binding_t *binding, switch_xml_t *xml, int *off); +static switch_status_t xml_ldap_dialplan_result(void *ldap_connection, xml_binding_t *binding, switch_xml_t *xml, int *off); #define XML_LDAP_SYNTAX "[debug_on|debug_off]" + SWITCH_STANDARD_API(xml_ldap_function) { if (session) { @@ -94,8 +96,10 @@ } if (!strcasecmp(cmd, "debug_on")) { - } else if (!strcasecmp(cmd, "debug_off")) { - } else { + } + else if (!strcasecmp(cmd, "debug_off")) { + } + else { goto usage; } @@ -107,207 +111,256 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t xml_ldap_result( void *ldap_connection, xml_binding_t *binding, switch_xml_t *xml, int *off, int qt) +static switch_status_t xml_ldap_result(void *ldap_connection, xml_binding_t *binding, switch_xml_t *xml, int *off, const xml_ldap_query_type_t query_type) { - switch_status_t ret; - if (qt == 1 ) ret = xml_ldap_directory_result(ldap_connection, binding, xml , off); - else if (qt == 2 ) ret = xml_ldap_dialplan_result(ldap_connection, binding, xml , off); - return ret; + switch (query_type) { + case XML_LDAP_DIRECTORY: + return xml_ldap_directory_result(ldap_connection, binding, xml, off); + + case XML_LDAP_DIALPLAN: + return xml_ldap_dialplan_result(ldap_connection, binding, xml, off); + + default: + return SWITCH_STATUS_FALSE; + } } -static switch_status_t xml_ldap_dialplan_result( void *ldap_connection, xml_binding_t *binding, switch_xml_t *xml, int *off) +static switch_status_t xml_ldap_dialplan_result(void *ldap_connection, xml_binding_t *binding, switch_xml_t *xml, int *off) { - return SWITCH_STATUS_FALSE; + return SWITCH_STATUS_FALSE; } -static switch_status_t xml_ldap_directory_result( void *ldap_connection, xml_binding_t *binding, switch_xml_t *xml, int *off) +static switch_status_t xml_ldap_directory_result(void *ldap_connection, xml_binding_t *binding, switch_xml_t *xml, int *off) { struct ldap_c *ldap = ldap_connection; - switch_xml_t asdf = *xml; - switch_xml_t param, variable, params, variables; - int i =0; - int loff = *off; - - for (ldap->entry = ldap_first_entry(ldap->ld,ldap->msg); ldap->entry != NULL; ldap->entry = ldap_next_entry(ldap->ld,ldap->entry)) { - ldap->key = ldap_first_attribute( ldap->ld, ldap->entry, &ldap->berkey ); - do { - ldap->val = ldap_first_attribute( ldap->ld, ldap->entry, &ldap->berval ); - do { - if(strstr(ldap->val,"value") ) { - if(strstr(ldap->val,ldap->key) && strcmp(ldap->val,ldap->key) ) { - if(!strcmp(ldap->key,"param")) { - params = switch_xml_add_child_d(asdf,"params",loff++); - }else if (!strcmp(ldap->key,"variable")) { - variables = switch_xml_add_child_d(asdf,"variables",loff++); - } - - if( (ldap->keyvals = ldap_get_values( ldap->ld, ldap->entry, ldap->key )) && (ldap->valvals = ldap_get_values( ldap->ld, ldap->entry, ldap->val )) ) { - if ( ldap_count_values(ldap->valvals) == ldap_count_values(ldap->keyvals) ) { - for ( i = 0 ; ldap->keyvals[i] != NULL && ldap->valvals[i] != NULL ; i++ ) { - if(!strcmp(ldap->key,"param")) { - param = switch_xml_add_child_d(params,"param",loff++); - switch_xml_set_attr_d(param,"name",ldap->keyvals[i]); - switch_xml_set_attr_d(param,"value",ldap->valvals[i]); - } - else if (!strcmp(ldap->key,"variable")) { - variable = switch_xml_add_child_d(variables,"variable",loff++); - switch_xml_set_attr_d(variable,"name",ldap->keyvals[i]); - switch_xml_set_attr_d(variable,"value",ldap->valvals[i]); - } - } - if ( ldap->keyvals ) ldap_value_free(ldap->keyvals); - if ( ldap->valvals ) ldap_value_free(ldap->valvals); - } - else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "seems the values %d and %d are not the same??\n",ldap_count_values ( ldap->valvals ), ldap_count_values ( ldap->keyvals )); - } - } - } - } - if (ldap->val) ldap_memfree(ldap->val); - ldap->val = ldap_next_attribute(ldap->ld, ldap->entry,ldap->berval); - } while (ldap->val != NULL); - if (ldap->key) ldap_memfree(ldap->key); - if (ldap->berval) ber_free(ldap->berval,0); - ldap->key = ldap_next_attribute(ldap->ld, ldap->entry, ldap->berkey ); - } while ( ldap->key != NULL ); - if (ldap->berkey) ber_free(ldap->berkey,0); - } - return SWITCH_STATUS_SUCCESS; + switch_xml_t asdf = *xml; + switch_xml_t param, variable, params, variables; + int i = 0; + int loff = *off; + + for (ldap->entry = ldap_first_entry(ldap->ld, ldap->msg); ldap->entry != NULL; ldap->entry = ldap_next_entry(ldap->ld, ldap->entry)) { + ldap->key = ldap_first_attribute(ldap->ld, ldap->entry, &ldap->berkey); + do { + ldap->val = ldap_first_attribute(ldap->ld, ldap->entry, &ldap->berval); + do { + if (strstr(ldap->val, "value")) { + if (strstr(ldap->val, ldap->key) && strcmp(ldap->val, ldap->key) ) { + if (!strcmp(ldap->key, "param")) { + params = switch_xml_add_child_d(asdf, "params", loff++); + } + else if (!strcmp(ldap->key, "variable")) { + variables = switch_xml_add_child_d(asdf, "variables", loff++); + } + + ldap->keyvals = ldap_get_values(ldap->ld, ldap->entry, ldap->key); + ldap->valvals = ldap_get_values(ldap->ld, ldap->entry, ldap->val); + + if (ldap->keyvals && ldap->valvals) { + if (ldap_count_values(ldap->valvals) == ldap_count_values(ldap->keyvals)) { + for (i = 0; ldap->keyvals[i] != NULL && ldap->valvals[i] != NULL; i++) { + if (!strcmp(ldap->key, "param")) { + param = switch_xml_add_child_d(params, "param", loff++); + switch_xml_set_attr_d(param, "name", ldap->keyvals[i]); + switch_xml_set_attr_d(param, "value", ldap->valvals[i]); + } + else if (!strcmp(ldap->key, "variable")) { + variable = switch_xml_add_child_d(variables, "variable", loff++); + switch_xml_set_attr_d(variable, "name", ldap->keyvals[i]); + switch_xml_set_attr_d(variable, "value", ldap->valvals[i]); + } + } + + if (ldap->keyvals) { + ldap_value_free(ldap->keyvals); + } + + if (ldap->valvals) { + ldap_value_free(ldap->valvals); + } + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "seems the values %d and %d are not the same??\n",ldap_count_values(ldap->valvals), ldap_count_values(ldap->keyvals)); + } + } + } + } + if (ldap->val) { + ldap_memfree(ldap->val); + } + + ldap->val = ldap_next_attribute(ldap->ld, ldap->entry, ldap->berval); + + } while (ldap->val != NULL); + + if (ldap->key) { + ldap_memfree(ldap->key); + } + + if (ldap->berval) { + ber_free(ldap->berval, 0); + } + + ldap->key = ldap_next_attribute(ldap->ld, ldap->entry, ldap->berkey ); + + } while (ldap->key != NULL); + + if (ldap->berkey) { + ber_free(ldap->berkey, 0); + } + } + return SWITCH_STATUS_SUCCESS; } -static switch_xml_t xml_ldap_search(const char *section, const char *tag_name, const char *key_name, const char *key_value, switch_event_t *params, void *user_data) +static switch_xml_t xml_ldap_search(const char *section, const char *tag_name, const char *key_name, const char *key_value, switch_event_t *params, void *user_data) { - xml_binding_t *binding = (xml_binding_t *) user_data; - switch_event_header_t *hi; - - switch_xml_t xml, sub; - - struct ldap_c ldap_connection; - struct ldap_c *ldap = &ldap_connection; - - int auth_method = LDAP_AUTH_SIMPLE; - int desired_version = LDAP_VERSION3; - int query_type; // see defines on top XML_LDAP_foo - char *dir_exten, *dir_domain; - char *filter = "(objectClass=*)"; + xml_binding_t *binding = (xml_binding_t *)user_data; + switch_event_header_t *hi; + + switch_xml_t xml, sub; + + struct ldap_c ldap_connection; + struct ldap_c *ldap = &ldap_connection; + + int auth_method = LDAP_AUTH_SIMPLE; + int desired_version = LDAP_VERSION3; + xml_ldap_query_type_t query_type; + char *dir_exten, *dir_domain; + char *filter = "(objectClass=*)"; - char *search_base = NULL; - int off = 0; + char *search_base = NULL; + int off = 0; if (!binding) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "no bindings...sorry bud returning now\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "no bindings...sorry bud returning now\n"); return NULL; } - if(!strcmp(section,"configuration")) { - query_type = 0; - } - else if (!strcmp(section,"directory")) { - query_type = 1; - } - else if (!strcmp(section,"dialplan")) { - query_type = 2; - } - else if (!strcmp(section,"phrases")) { - query_type = 3; - } - - - if (params) { - if ((hi = params->headers)) { - for (; hi; hi = hi->next) { - switch(query_type) { - case XML_LDAP_CONFIG: - break; - case XML_LDAP_DIRECTORY: - if (!strcmp(hi->name,"user")) dir_exten = strdup(hi->value); - else if (!strcmp(hi->name,"domain")) dir_domain = strdup(hi->value); - break; - case XML_LDAP_DIALPLAN: - break; - case XML_LDAP_PHRASE: - break; - } - } - switch(query_type) { - case XML_LDAP_CONFIG: - break; - case XML_LDAP_DIRECTORY: - if ( dir_exten && dir_domain ) { - xml = switch_xml_new("directory"); - switch_xml_set_attr_d(xml,"type","freeswitch/xml"); - sub = switch_xml_add_child_d(xml,"section",off++); - switch_xml_set_attr_d(sub,"name","directory"); - sub = switch_xml_add_child_d(sub,"domain",off++); - switch_xml_set_attr_d(sub,"name",dir_domain); - sub = switch_xml_add_child_d(sub,"user",off++); - switch_xml_set_attr_d(sub,"id",dir_exten); - - search_base = switch_mprintf(binding->queryfmt,dir_exten,dir_domain,binding->ldap_base); - - free(dir_exten); - dir_exten = NULL; - free(dir_domain); - dir_domain = NULL; - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "something bad happened during the query construction phase likely exten(%s) or domain(%s) is null\n",dir_exten,dir_domain); - goto cleanup; - } - break; - case XML_LDAP_DIALPLAN: - xml = switch_xml_new("document"); - switch_xml_set_attr_d(xml,"type","freeswitch/xml"); - sub = switch_xml_add_child_d(xml,"section",off++); - switch_xml_set_attr_d(sub,"name","dialplan"); - sub = switch_xml_add_child_d(xml,"context",off++); - search_base = switch_mprintf(binding->queryfmt,dir_exten,dir_domain,binding->ldap_base); - break; - case XML_LDAP_PHRASE: - break; - } - } - else { - goto cleanup; - } - } - - - if ((ldap->ld = ldap_init(binding->host, LDAP_PORT)) == NULL) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to connect to ldap server.%s\n", binding->host); - goto cleanup; - } - - if (ldap_set_option(ldap->ld, LDAP_OPT_PROTOCOL_VERSION, &desired_version) != LDAP_OPT_SUCCESS) { - goto cleanup; - } - - if (ldap_bind_s(ldap->ld, binding->binddn, binding->bindpass, auth_method) != LDAP_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to bind to ldap server %s as %s\n",binding->host, binding->binddn); - goto cleanup; - } - - if (ldap_search_s(ldap->ld, search_base, LDAP_SCOPE_SUBTREE, filter, NULL, 0, &ldap->msg) != LDAP_SUCCESS) { - goto cleanup; - } - - if (ldap_count_entries(ldap->ld, ldap->msg) <= 0) { - goto cleanup; - } - - if ( xml_ldap_result( &ldap_connection, binding, &sub, &off, query_type) != SWITCH_STATUS_SUCCESS ){ - goto cleanup; - } - - cleanup: - if (ldap->msg) ldap_msgfree(ldap->msg); - if (ldap->ld) ldap_unbind_s(ldap->ld); - - switch_safe_free(search_base); + if (!strcmp(section,"configuration")) { + query_type = XML_LDAP_CONFIG; + } + else if (!strcmp(section,"directory")) { + query_type = XML_LDAP_DIRECTORY; + } + else if (!strcmp(section,"dialplan")) { + query_type = XML_LDAP_DIALPLAN; + } + else if (!strcmp(section,"phrases")) { + query_type = XML_LDAP_PHRASE; + } + + if (params) { + if ((hi = params->headers)) { + for (; hi; hi = hi->next) { + switch(query_type) { + case XML_LDAP_CONFIG: + break; + + case XML_LDAP_DIRECTORY: + if (!strcmp(hi->name,"user")) { + dir_exten = strdup(hi->value); + } + else if (!strcmp(hi->name,"domain")) { + dir_domain = strdup(hi->value); + } + break; + + case XML_LDAP_DIALPLAN: + case XML_LDAP_PHRASE: + break; + } + } + switch(query_type) { + case XML_LDAP_CONFIG: + break; + + case XML_LDAP_DIRECTORY: + if (dir_exten && dir_domain) { + xml = switch_xml_new("directory"); + switch_xml_set_attr_d(xml, "type", "freeswitch/xml"); + + sub = switch_xml_add_child_d(xml, "section", off++); + switch_xml_set_attr_d(sub, "name", "directory"); + + sub = switch_xml_add_child_d(sub, "domain", off++); + switch_xml_set_attr_d(sub, "name", dir_domain); + + sub = switch_xml_add_child_d(sub, "user", off++); + switch_xml_set_attr_d(sub, "id", dir_exten); + + search_base = switch_mprintf(binding->queryfmt, dir_exten, dir_domain, binding->ldap_base); + + free(dir_exten); + dir_exten = NULL; + + free(dir_domain); + dir_domain = NULL; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "something bad happened during the query construction phase likely exten(%s) or domain(%s) is null\n", dir_exten, dir_domain); + goto cleanup; + } + break; + + case XML_LDAP_DIALPLAN: + xml = switch_xml_new("document"); + switch_xml_set_attr_d(xml, "type", "freeswitch/xml"); + + sub = switch_xml_add_child_d(xml, "section", off++); + switch_xml_set_attr_d(sub, "name", "dialplan"); + + sub = switch_xml_add_child_d(xml, "context", off++); + search_base = switch_mprintf(binding->queryfmt, dir_exten, dir_domain, binding->ldap_base); + break; + + case XML_LDAP_PHRASE: + break; + } + } + else { + goto cleanup; + } + } + + + if ((ldap->ld = ldap_init(binding->host, LDAP_PORT)) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to connect to ldap server.%s\n", binding->host); + goto cleanup; + } + + if (ldap_set_option(ldap->ld, LDAP_OPT_PROTOCOL_VERSION, &desired_version) != LDAP_OPT_SUCCESS) { + goto cleanup; + } + + if (ldap_bind_s(ldap->ld, binding->binddn, binding->bindpass, auth_method) != LDAP_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to bind to ldap server %s as %s\n", binding->host, binding->binddn); + goto cleanup; + } - return xml; + if (ldap_search_s(ldap->ld, search_base, LDAP_SCOPE_SUBTREE, filter, NULL, 0, &ldap->msg) != LDAP_SUCCESS) { + goto cleanup; + } + + if (ldap_count_entries(ldap->ld, ldap->msg) <= 0) { + goto cleanup; + } + + if (xml_ldap_result(&ldap_connection, binding, &sub, &off, query_type) != SWITCH_STATUS_SUCCESS) { + goto cleanup; + } + +cleanup: + if (ldap->msg) { + ldap_msgfree(ldap->msg); + } + + if (ldap->ld) { + ldap_unbind_s(ldap->ld); + } + + switch_safe_free(search_base); + + return xml; } @@ -331,47 +384,51 @@ for (binding_tag = switch_xml_child(bindings_tag, "binding"); binding_tag; binding_tag = binding_tag->next) { char *bname = (char *) switch_xml_attr_soft(binding_tag, "name"); - if (!(binding = malloc(sizeof(*binding)))) { - goto done; - } - memset(binding, 0, sizeof(*binding)); - - - + if (!(binding = malloc(sizeof(*binding)))) { + goto done; + } + memset(binding, 0, sizeof(*binding)); for (param = switch_xml_child(binding_tag, "param"); param; param = param->next) { - char *var = (char *) switch_xml_attr_soft(param, "name"); char *val = (char *) switch_xml_attr_soft(param, "value"); - if (!strcasecmp(var, "queryfmt")) { - binding->bindings = (char *) switch_xml_attr_soft(param, "bindings"); - if(val) binding->queryfmt = strdup(val); - } else if (!strcasecmp(var, "base")) { - binding->ldap_base = strdup(val); - } else if (!strcasecmp(var, "binddn")) { + + if (!strcasecmp(var, "queryfmt")) { + binding->bindings = (char *) switch_xml_attr_soft(param, "bindings"); + if (val) { + binding->queryfmt = strdup(val); + } + } + else if (!strcasecmp(var, "base")) { + binding->ldap_base = strdup(val); + } + else if (!strcasecmp(var, "binddn")) { binding->binddn = strdup(val); - } else if (!strcasecmp(var, "bindpass")) { - binding->bindpass = strdup(val); - } else if (!strcasecmp(var, "host")) { - binding->host = strdup(val); - } + } + else if (!strcasecmp(var, "bindpass")) { + binding->bindpass = strdup(val); + } + else if (!strcasecmp(var, "host")) { + binding->host = strdup(val); + } } - if (!binding->ldap_base || !binding->binddn || !binding->bindpass ) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "You must define base binddn bindpass\n"); + if (!binding->ldap_base || !binding->binddn || !binding->bindpass || !binding->queryfmt) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "You must define \"base\", \"binddn\", \"bindpass\", and \"queryfmt\" in mod_xml_ldap.conf.xml\n"); continue; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Binding [%s] XML Fetch Function [%s] [%s]\n", - switch_strlen_zero(bname) ? "N/A" : bname, binding->ldap_base, binding->bindings ? binding->bindings : "all"); + switch_strlen_zero(bname) ? "N/A" : bname, binding->ldap_base, binding->bindings ? binding->bindings : "all"); + switch_xml_bind_search_function(xml_ldap_search, switch_xml_parse_section_string(bname), binding); + x++; binding = NULL; } - done: +done: switch_xml_free(xml); return SWITCH_STATUS_SUCCESS; @@ -386,9 +443,11 @@ *module_interface = switch_loadable_module_create_module_interface(pool, modname); SWITCH_ADD_API(xml_ldap_api_interface, "xml_ldap", "XML LDAP", xml_ldap_function, XML_LDAP_SYNTAX); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "XML LDAP module loading...\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "XML LDAP module loading...\n"); - if (! (do_config() == SWITCH_STATUS_SUCCESS) ) return SWITCH_STATUS_FALSE; + if (do_config() != SWITCH_STATUS_SUCCESS) { + return SWITCH_STATUS_FALSE; + } /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS;

1 0