- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r2385 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 24 Aug '06

24 Aug '06

Author: anthm Date: Thu Aug 24 16:23:43 2006 New Revision: 2385 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: conference update Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Aug 24 16:23:43 2006 @@ -697,8 +697,10 @@ return; } - /* Answer the channel */ - switch_channel_answer(channel); + if (!switch_channel_test_flag(channel, CF_OUTBOUND)) { + /* Answer the channel */ + switch_channel_answer(channel); + } /* Prepare the write frame */ write_frame.data = data; @@ -1806,34 +1808,83 @@ conference_member_t *member = NULL; uint32_t id = atoi(argv[2]); conference_obj_t *new_conference = NULL; + switch_channel_t *channel; + switch_event_t *event; + char *profile_name; + switch_xml_t cxml = NULL, cfg = NULL, profile = NULL, profiles = NULL; - if ((new_conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, argv[3]))) { - if ((member = conference_member_get(conference, id))) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_event_t *event; - - conference_del_member(member->last_conference, member); - conference_add_member(new_conference, member); - stream->write_function(stream, "OK Member %u sent to conference %s.\n", id, argv[3]); + if (!(member = conference_member_get(conference, id))) { + stream->write_function(stream, "No Member %u in conference %s.\n", id, conference->name); + goto done; + } + + channel = switch_core_session_get_channel(member->session); + + if (!(new_conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, argv[3]))) { + switch_memory_pool_t *pool; + char *conf_name; - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_event_set_data(channel, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Old-Conference-Name", conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Conference-Name", argv[3]); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "transfer"); - switch_event_fire(&event); + /* Setup a memory pool to use. */ + if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); + goto done; + } + + conf_name = switch_core_strdup(pool, argv[3]); + + if ((profile_name = strchr(conf_name, '@'))) { + *profile_name++ = '\0'; + + /* Open the config from the xml registry */ + if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name); + goto done; } + + if ((profiles = switch_xml_child(cfg, "profiles"))) { + profile = switch_xml_find_child(profiles, "profile", "name", profile_name); + } + } + + + /* Release the config registry handle */ + if (cxml) { + switch_xml_free(cxml); + cxml = NULL; + } + + /* Create the conference object. */ + new_conference = conference_new(conf_name, profile, pool); + + + if (!new_conference) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); goto done; - } else { - stream->write_function(stream, "No Member %u in conference %s.\n", id, conference->name); - goto done; } - } else { - stream->write_function(stream, "No Conference called %s found.\n", argv[3]); - goto done; + + /* Set the minimum number of members (once you go above it you cannot go below it) */ + new_conference->min = 1; + + /* Indicate the conference is dynamic */ + switch_set_flag_locked(new_conference, CFLAG_DYNAMIC); + + /* Start the conference thread for this conference */ + launch_conference_thread(new_conference); } + conference_del_member(member->last_conference, member); + conference_add_member(new_conference, member); + stream->write_function(stream, "OK Member %u sent to conference %s.\n", id, argv[3]); + + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_event_set_data(channel, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Old-Conference-Name", conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Conference-Name", argv[3]); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "transfer"); + switch_event_fire(&event); + } + } else { stream->write_function(stream, transfer_usage); goto done; @@ -2160,7 +2211,6 @@ conference->min = 2; if (dpin) { - printf("ASS [%s]\n", dpin); conference->pin = switch_core_strdup(conference->pool, dpin); }

1 0

[commit] r2384 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by Freeswitch SVN 24 Aug '06

24 Aug '06

Author: anthm Date: Thu Aug 24 15:54:09 2006 New Revision: 2384 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: fix Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Thu Aug 24 15:54:09 2006 @@ -184,9 +184,8 @@ struct private_object *tech_pvt = NULL; tech_pvt = switch_core_session_get_private(*session); - assert(tech_pvt != NULL); - if (tech_pvt->dlsession) { + if (tech_pvt && tech_pvt->dlsession) { if (!switch_test_flag(tech_pvt, TFLAG_TERM)) { ldl_session_terminate(tech_pvt->dlsession); switch_set_flag_locked(tech_pvt, TFLAG_TERM); @@ -203,7 +202,7 @@ channel_on_hangup(*session); } - if (tech_pvt->dlsession) { + if (tech_pvt && tech_pvt->dlsession) { ldl_session_set_private(tech_pvt->dlsession, NULL); } switch_core_session_destroy(session);

1 0

[commit] r2383 - freeswitch/branches/dprado
by Freeswitch SVN 24 Aug '06

24 Aug '06

Author: sphere Date: Thu Aug 24 09:57:39 2006 New Revision: 2383 Added: freeswitch/branches/dprado/ Log: Creating empty folder for dprado

1 0

[commit] r2382 - freeswitch/branches/pieere
by Freeswitch SVN 24 Aug '06

24 Aug '06

Author: sphere Date: Thu Aug 24 05:13:57 2006 New Revision: 2382 Added: freeswitch/branches/pieere/ Log: Creating empty folder for pieere

1 0

[commit] r2381 - in freeswitch/trunk: conf src/mod/applications/mod_conference
by Freeswitch SVN 24 Aug '06

24 Aug '06

Author: anthm Date: Wed Aug 23 22:22:57 2006 New Revision: 2381 Modified: freeswitch/trunk/conf/freeswitch.xml freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: change conference no more <rooms> rooms will just be created on the fly. <action application="conference" data="myconf@myprofile+1234"/> +1234 is optional on-the-fly pin Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Wed Aug 23 22:22:57 2006 @@ -349,9 +349,6 @@ <param name="caller-id-number" value="8777423583"/> </profile> </profiles> - <rooms> - <room name="freeswitch" profile="default"/> - </rooms> </configuration> </section> <section name="dialplan" description="Regex/XML Dialplan"> Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Wed Aug 23 22:22:57 2006 @@ -121,6 +121,7 @@ char *pin; char *pin_sound; char *bad_pin_sound; + char *profile_name; uint32_t flags; switch_mutex_t *flag_mutex; uint32_t rate; @@ -2070,6 +2071,8 @@ char *flags_str; member_flag_t uflags = MFLAG_CAN_SPEAK | MFLAG_CAN_HEAR; switch_core_session_message_t msg = {0}; + uint8_t isbr = 0; + char *dpin = NULL; channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -2103,32 +2106,39 @@ } if (!strncasecmp(mydata, bridge_prefix, strlen(bridge_prefix))) { - char *uuid = switch_core_session_get_uuid(session); - + isbr = 1; mydata += strlen(bridge_prefix); - conf_name = mydata; - - if ((bridgeto = strchr(conf_name, ':'))) { + if ((bridgeto = strchr(mydata, ':'))) { *bridgeto++ = '\0'; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Config Error!\n"); goto done; } + } - if ((profile_name = strchr(conf_name, '@'))) { - *profile_name++ = '\0'; + conf_name = mydata; - /* Open the config from the xml registry */ - if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, NULL))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name); - goto done; - } - - if ((profiles = switch_xml_child(cfg, "profiles"))) { - profile = switch_xml_find_child(profiles, "profile", "name", profile_name); - } + if ((dpin = strchr(conf_name, '+'))) { + *dpin++ = '\0'; + } + + if ((profile_name = strchr(conf_name, '@'))) { + *profile_name++ = '\0'; + + /* Open the config from the xml registry */ + if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name); + goto done; } + + if ((profiles = switch_xml_child(cfg, "profiles"))) { + profile = switch_xml_find_child(profiles, "profile", "name", profile_name); + } + } + if (isbr) { + char *uuid = switch_core_session_get_uuid(session); + if (!strcmp(conf_name, "_uuid_")) { conf_name = uuid; } @@ -2141,10 +2151,6 @@ /* Create the conference object. */ conference = conference_new(conf_name, profile, pool); - /* Release the config registry handle */ - switch_xml_free(cxml); - cxml = NULL; - if (!conference) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); goto done; @@ -2153,6 +2159,11 @@ /* Set the minimum number of members (once you go above it you cannot go below it) */ conference->min = 2; + if (dpin) { + printf("ASS [%s]\n", dpin); + conference->pin = switch_core_strdup(conference->pool, dpin); + } + /* Indicate the conference is dynamic */ switch_set_flag_locked(conference, CFLAG_DYNAMIC); @@ -2160,12 +2171,32 @@ launch_conference_thread(conference); } else { - conf_name = mydata; - freepool = pool; /* Figure out what conference to call. */ - if (!(conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, conf_name))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Conference called %s found.\n", conf_name); - goto done; + if ((conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, conf_name))) { + freepool = pool; + } else { + /* Create the conference object. */ + conference = conference_new(conf_name, profile, pool); + + + if (!conference) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); + goto done; + } + + if (dpin) { + conference->pin = switch_core_strdup(conference->pool, dpin); + } + + /* Set the minimum number of members (once you go above it you cannot go below it) */ + conference->min = 1; + + /* Indicate the conference is dynamic */ + switch_set_flag_locked(conference, CFLAG_DYNAMIC); + + /* Start the conference thread for this conference */ + launch_conference_thread(conference); + } if (conference->pin) { @@ -2178,7 +2209,7 @@ if (conference->pin_sound) { conference_local_play_file(session, conference->pin_sound, 20, pin, sizeof(pin)); - } + } if (strlen(pin) < strlen(conference->pin)) { buf = pin + strlen(pin); @@ -2209,6 +2240,13 @@ } + /* Release the config registry handle */ + if (cxml) { + switch_xml_free(cxml); + cxml = NULL; + } + + if (!switch_strlen_zero(bridgeto) && strcasecmp(bridgeto, "none")) { if (conference_outcall(conference, session, bridgeto, 60, NULL, NULL) != SWITCH_STATUS_SUCCESS) { goto done; @@ -2757,8 +2795,6 @@ /* Called by FreeSWITCH when the module loads */ SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) { - switch_xml_t cfg, cxml, room, rooms, profiles, profile = NULL; - conference_obj_t *conference; switch_status_t status = SWITCH_STATUS_SUCCESS; memset(&globals, 0, sizeof(globals)); @@ -2777,38 +2813,11 @@ return SWITCH_STATUS_TERM; } - /* Open the config from the xml registry */ - if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, NULL))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name); - return SWITCH_STATUS_TERM; - } - /* Setup a hash to store conferences by name */ switch_core_hash_init(&globals.conference_hash, globals.conference_pool); switch_mutex_init(&globals.conference_mutex, SWITCH_MUTEX_NESTED, globals.conference_pool); switch_mutex_init(&globals.id_mutex, SWITCH_MUTEX_NESTED, globals.conference_pool); switch_mutex_init(&globals.hash_mutex, SWITCH_MUTEX_NESTED, globals.conference_pool); - - /* Itterate the config */ - if ((rooms = switch_xml_child(cfg, "rooms"))) { - /* Parse various rooms. */ - for (room = switch_xml_child(rooms, "room"); room; room = room->next) { - char *name = (char *) switch_xml_attr_soft(room, "name"); - char *pname = (char *) switch_xml_attr_soft(room, "profile"); - - if ((profiles = switch_xml_child(cfg, "profiles"))) { - profile = switch_xml_find_child(profiles, "profile", "name", pname); - } - - if ((conference = conference_new(name, profile, NULL))) { - /* Start the conference thread for this conference */ - launch_conference_thread(conference); - } - } - } - - /* Release the config registry handle */ - switch_xml_free(cxml); globals.running = 1; /* indicate that the module should continue to be loaded */

1 0

[commit] r2380 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 24 Aug '06

24 Aug '06

Author: anthm Date: Wed Aug 23 20:44:47 2006 New Revision: 2380 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: add 1 person dyna conference Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Wed Aug 23 20:44:47 2006 @@ -2209,7 +2209,7 @@ } - if (bridgeto) { + if (!switch_strlen_zero(bridgeto) && strcasecmp(bridgeto, "none")) { if (conference_outcall(conference, session, bridgeto, 60, NULL, NULL) != SWITCH_STATUS_SUCCESS) { goto done; }

1 0

[commit] r2379 - freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event
by Freeswitch SVN 23 Aug '06

23 Aug '06

Author: anthm Date: Wed Aug 23 19:24:23 2006 New Revision: 2379 Modified: freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c Log: add reply Modified: freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c Wed Aug 23 19:24:23 2006 @@ -253,6 +253,7 @@ switch_stream_handle_t stream = {0}; char retbuf[2048] = ""; char *p; + iks *msg; if ((p = strchr(cmd, '\r')) != 0) { *p++ = '\0'; @@ -269,6 +270,13 @@ stream.data_size = sizeof(retbuf); stream.write_function = switch_console_stream_write; switch_api_execute(cmd, arg, NULL, &stream); + + + msg = iks_make_msg(IKS_TYPE_NONE, globals.target_jid, retbuf); + iks_insert_attrib(msg, "subject", "Reply"); + iks_send(globals.session.parser, msg); + iks_delete(msg); + return 0; }

1 0

[commit] r2378 - freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event
by Freeswitch SVN 23 Aug '06

23 Aug '06

Author: anthm Date: Wed Aug 23 19:08:45 2006 New Revision: 2378 Modified: freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c Log: add presence Modified: freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c Wed Aug 23 19:08:45 2006 @@ -148,6 +148,17 @@ static int on_result(struct session *sess, ikspak * pak) { + iks *msg, *ctag; + + msg = iks_make_pres (IKS_SHOW_AVAILABLE, "Available"); + ctag = iks_insert(msg, "c"); + iks_insert_attrib(ctag, "node", "http://www.freeswitch.org/xmpp/client/caps"); + iks_insert_attrib(ctag, "ver", "1.0.0.1"); + iks_insert_attrib(ctag, "client", "libdingaling"); + iks_insert_attrib(ctag, "xmlns", "http://jabber.org/protocol/caps"); + + iks_send(sess->parser, msg); + iks_delete(msg); return IKS_FILTER_EAT; }

1 0

[commit] r2377 - freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event
by Freeswitch SVN 23 Aug '06

23 Aug '06

Author: anthm Date: Wed Aug 23 18:38:53 2006 New Revision: 2377 Modified: freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c Log: add auto buddy Modified: freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c Wed Aug 23 18:38:53 2006 @@ -218,6 +218,23 @@ return IKS_OK; } + +static int on_subscribe(void *user_data, ikspak *pak) +{ + char *from = iks_find_attrib(pak->x, "from"); + struct session *sess = (struct session *) user_data; + + iks *msg = iks_make_s10n (IKS_TYPE_SUBSCRIBED, from, "mod_xmpp_event"); + iks_send(sess->parser, msg); + iks_delete(msg); + + msg = iks_make_s10n (IKS_TYPE_SUBSCRIBE, from, "mod_xmpp_event"); + iks_send(sess->parser, msg); + iks_delete(msg); + + return IKS_FILTER_EAT; +} + static int on_msg(void *user_data, ikspak * pak) { char *cmd = iks_find_cdata(pak->x, "body"); @@ -276,6 +293,12 @@ iks_filter_add_rule(my_filter, on_error, sess, IKS_RULE_TYPE, IKS_PAK_IQ, IKS_RULE_SUBTYPE, IKS_TYPE_ERROR, IKS_RULE_ID, "auth", IKS_RULE_DONE); + + iks_filter_add_rule(my_filter, on_subscribe, sess, + IKS_RULE_TYPE, IKS_PAK_S10N, + IKS_RULE_SUBTYPE, IKS_TYPE_SUBSCRIBE, + IKS_RULE_DONE); + } static void xmpp_connect(char *jabber_id, char *pass)

1 0

[commit] r2376 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by Freeswitch SVN 23 Aug '06

23 Aug '06

Author: anthm Date: Wed Aug 23 17:08:28 2006 New Revision: 2376 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: fix stupid oversight Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Wed Aug 23 17:08:28 2006 @@ -498,8 +498,8 @@ } else { payloads[0].name = lame(tech_pvt->codecs[tech_pvt->codec_index]->iananame); payloads[0].id = tech_pvt->codecs[tech_pvt->codec_index]->ianacode; - payloads[0].rate = tech_pvt->codecs[0]->samples_per_second; - payloads[0].bps = tech_pvt->codecs[0]->bits_per_second; + payloads[0].rate = tech_pvt->codecs[tech_pvt->codec_index]->samples_per_second; + payloads[0].bps = tech_pvt->codecs[tech_pvt->codec_index]->bits_per_second; }

1 0