September 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r9582 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 18 Sep '08

18 Sep '08

Author: anthm Date: Wed Sep 17 20:01:03 2008 New Revision: 9582 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 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: add profile civil unions warning will nuke your db table next time you update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Sep 17 20:01:03 2008 @@ -268,7 +268,7 @@ switch_core_hash_delete(tech_pvt->profile->chat_hash, tech_pvt->hash_key); } - if (session && (tech_pvt->profile->pflags & PFLAG_PRESENCE)) { + if (session && tech_pvt->profile->pres_type) { char *sql = switch_mprintf("delete from sip_dialogs where call_id='%q'", tech_pvt->call_id); switch_assert(sql); sofia_glue_execute_sql(tech_pvt->profile, &sql, SWITCH_TRUE); @@ -1214,13 +1214,14 @@ } cb->stream->write_function(cb->stream, - "Call-ID \t%s\n" - "User \t%s@%s\n" - "Contact \t%s\n" - "Agent \t%s\n" - "Status \t%s(%s) EXP(%s)\n\n", + "Call-ID: \t%s\n" + "User: \t%s@%s\n" + "Contact: \t%s\n" + "Agent: \t%s\n" + "Status: \t%s(%s) EXP(%s)\n" + "Host: \t%s\n\n", switch_str_nil(argv[0]), switch_str_nil(argv[1]), switch_str_nil(argv[2]), switch_str_nil(argv[3]), - switch_str_nil(argv[7]), switch_str_nil(argv[4]), switch_str_nil(argv[5]), exp_buf); + switch_str_nil(argv[7]), switch_str_nil(argv[4]), switch_str_nil(argv[5]), exp_buf, switch_str_nil(argv[11])); return 0; } @@ -1279,6 +1280,7 @@ stream->write_function(stream, "Alias Of \t\t%s\n", switch_str_nil(profile->name)); } stream->write_function(stream, "DBName \t\t%s\n", switch_str_nil(profile->dbname)); + stream->write_function(stream, "Pres Hosts \t\t%s\n", switch_str_nil(profile->presence_hosts)); stream->write_function(stream, "Dialplan \t\t%s\n", switch_str_nil(profile->dialplan)); stream->write_function(stream, "Context \t\t%s\n", switch_str_nil(profile->context)); stream->write_function(stream, "RTP-IP \t\t%s\n", switch_str_nil(profile->rtpip)); @@ -1320,7 +1322,10 @@ cb.profile = profile; cb.stream = stream; - sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, "select * from sip_registrations", show_reg_callback, &cb); + sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, + "select call_id,sip_user,sip_host,contact,status," + "rpid,expires,user_agent,server_user,server_host,profile_name,hostname" + " from sip_registrations", show_reg_callback, &cb); stream->write_function(stream, "%s\n", line); @@ -1599,7 +1604,7 @@ char *contact; if (!switch_strlen_zero(argv[0]) && (contact = sofia_glue_get_url_from_contact(argv[0], 1)) ) { - cb->stream->write_function(cb->stream, "%ssofia/%s/%s,", argv[1], cb->profile->name, sofia_glue_strip_proto(contact)); + cb->stream->write_function(cb->stream, "%ssofia/%s/%s,", argv[2], argv[1], sofia_glue_strip_proto(contact)); free(contact); } @@ -1682,11 +1687,14 @@ cb.stream = &mystream; if (exclude_contact) { - sql = switch_mprintf("select contact, '%q' from sip_registrations where sip_user='%q' and sip_host='%q' and contact not like '%%%s%%'", - ( concat != NULL ) ? concat : "", user, domain, exclude_contact); + sql = switch_mprintf("select contact, profile_name, '%q' " + "from sip_registrations where sip_user='%q' and (sip_host='%q' or presence_hosts like '%%%q%%') " + "and contact not like '%%%s%%'", + ( concat != NULL ) ? concat : "", user, domain, domain, exclude_contact); } else { - sql = switch_mprintf("select contact, '%q' from sip_registrations where sip_user='%q' and sip_host='%q'", - ( concat != NULL ) ? concat : "", user, domain); + sql = switch_mprintf("select contact, profile_name, '%q' " + "from sip_registrations where sip_user='%q' and (sip_host='%q' or presence_hosts like '%%%q%%')", + ( concat != NULL ) ? concat : "", user, domain, domain); } switch_assert(sql); @@ -2006,7 +2014,7 @@ if (tech_pvt->local_url) { switch_channel_set_variable(nchannel, "sip_local_url", tech_pvt->local_url); - if (sofia_test_pflag(profile, PFLAG_PRESENCE)) { + if (profile->pres_type) { switch_channel_set_variable(nchannel, "presence_id", tech_pvt->local_url); } } @@ -2219,6 +2227,8 @@ switch_mutex_init(&mod_sofia_globals.mutex, SWITCH_MUTEX_NESTED, mod_sofia_globals.pool); switch_find_local_ip(mod_sofia_globals.guess_ip, sizeof(mod_sofia_globals.guess_ip), AF_INET); + gethostname(mod_sofia_globals.hostname, sizeof(mod_sofia_globals.hostname)); + switch_core_hash_init(&mod_sofia_globals.profile_hash, mod_sofia_globals.pool); switch_core_hash_init(&mod_sofia_globals.gateway_hash, mod_sofia_globals.pool); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Wed Sep 17 20:01:03 2008 @@ -137,7 +137,7 @@ PFLAG_BLIND_REG = (1 << 1), PFLAG_AUTH_ALL = (1 << 2), PFLAG_FULL_ID = (1 << 3), - PFLAG_PRESENCE = (1 << 4), + PFLAG_USE_ME = (1 << 4), PFLAG_PASS_RFC2833 = (1 << 5), PFLAG_DISABLE_TRANSCODING = (1 << 6), PFLAG_REWRITE_TIMESTAMPS = (1 << 7), @@ -218,6 +218,7 @@ int32_t threads; switch_mutex_t *mutex; char guess_ip[80]; + char hostname[512]; switch_queue_t *presence_queue; switch_queue_t *mwi_queue; struct sofia_private destroy_private; @@ -295,6 +296,12 @@ struct sofia_gateway *next; }; +typedef enum { + PRES_TYPE_NONE = 0, + PRES_TYPE_FULL = 1, + PRES_TYPE_PASSIVE = 2 +} sofia_presence_type_t; + struct sofia_profile { int debug; char *name; @@ -321,6 +328,7 @@ char *reg_db_domain; char *user_agent; char *record_template; + char *presence_hosts; sofia_dtmf_t dtmf_type; int sip_port; int tls_sip_port; @@ -367,6 +375,7 @@ char *nat_acl[SOFIA_MAX_ACL]; uint32_t nat_acl_count; int rport_level; + sofia_presence_type_t pres_type; }; struct private_object { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Wed Sep 17 20:01:03 2008 @@ -72,7 +72,7 @@ { if (status >= 300 && sip && sip->sip_call_id) { char *sql; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "delete subscriptions for failed notify\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "delete subscriptions for failed notify\n"); sql = switch_mprintf("delete from sip_subscriptions where call_id='%q'", sip->sip_call_id->i_id); switch_assert(sql != NULL); sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); @@ -387,6 +387,7 @@ long expires = (long) switch_timestamp(NULL); char *profile_name = switch_event_get_header(event, "orig-profile-name"); char *to_user = switch_event_get_header(event, "orig-to-user"); + char *presence_hosts = switch_event_get_header(event, "presence-hosts"); sofia_profile_t *profile = NULL; char guess_ip4[256]; @@ -413,8 +414,11 @@ sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); switch_find_local_ip(guess_ip4, sizeof(guess_ip4), AF_INET); - sql = switch_mprintf("insert into sip_registrations values ('%q', '%q','%q','%q','Registered', '%q', %ld, '%q', '%q', '%q')", - call_id, from_user, from_host, contact_str, rpid, expires, user_agent, to_user, guess_ip4); + sql = switch_mprintf("insert into sip_registrations " + "(call_id,sip_user,sip_host,presence_hosts,contact,status,rpid,expires,user_agent,server_user,server_host,profile_name,hostname) " + "values ('%q', '%q','%q','%q','Registered', '%q', %ld, '%q', '%q', '%q','%q','%q')", + call_id, from_user, from_host, presence_hosts, contact_str, rpid, expires, user_agent, to_user, guess_ip4, + profile_name,mod_sofia_globals.hostname); if (sql) { sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); @@ -572,16 +576,16 @@ NUTAG_ALLOW_EVENTS("talk"), NUTAG_SESSION_TIMER(profile->session_timeout), NTATAG_MAX_PROCEEDING(profile->max_proceeding), - TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW("PUBLISH")), - TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW("SUBSCRIBE")), - TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ENABLEMESSAGE(1)), - TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW_EVENTS("presence")), - TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW_EVENTS("dialog")), - TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW_EVENTS("call-info")), - TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW_EVENTS("sla")), - TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW_EVENTS("include-session-description")), - TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW_EVENTS("presence.winfo")), - TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW_EVENTS("message-summary")), + TAG_IF(profile->pres_type, NUTAG_ALLOW("PUBLISH")), + TAG_IF(profile->pres_type, NUTAG_ALLOW("SUBSCRIBE")), + TAG_IF(profile->pres_type, NUTAG_ENABLEMESSAGE(1)), + TAG_IF(profile->pres_type, NUTAG_ALLOW_EVENTS("presence")), + TAG_IF(profile->pres_type, NUTAG_ALLOW_EVENTS("dialog")), + TAG_IF(profile->pres_type, NUTAG_ALLOW_EVENTS("call-info")), + TAG_IF(profile->pres_type, NUTAG_ALLOW_EVENTS("sla")), + TAG_IF(profile->pres_type, NUTAG_ALLOW_EVENTS("include-session-description")), + TAG_IF(profile->pres_type, NUTAG_ALLOW_EVENTS("presence.winfo")), + TAG_IF(profile->pres_type, NUTAG_ALLOW_EVENTS("message-summary")), SIPTAG_SUPPORTED_STR(supported), SIPTAG_USER_AGENT_STR(profile->user_agent), TAG_END()); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set params for %s\n", profile->name); @@ -600,8 +604,8 @@ TAG_IF((profile->mflags & MFLAG_REGISTER), NUTAG_ALLOW("REGISTER")), TAG_IF((profile->mflags & MFLAG_REFER), NUTAG_ALLOW("REFER")), NUTAG_ALLOW("INFO"), - TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW("PUBLISH")), - TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ENABLEMESSAGE(1)), + TAG_IF(profile->pres_type, NUTAG_ALLOW("PUBLISH")), + TAG_IF(profile->pres_type, NUTAG_ENABLEMESSAGE(1)), SIPTAG_SUPPORTED_STR(supported), SIPTAG_USER_AGENT_STR(profile->user_agent), TAG_END()); } @@ -628,7 +632,7 @@ sofia_glue_add_profile(profile->name, profile); - if (profile->pflags & PFLAG_PRESENCE) { + if (profile->pres_type) { sofia_presence_establish_presence(profile); } @@ -1443,8 +1447,12 @@ if (switch_true(val)) { profile->rport_level = 2; } + } else if (!strcasecmp(var, "dbname")) { + profile->dbname = switch_core_strdup(profile->pool, val); + } else if (!strcasecmp(var, "presence-hosts")) { + profile->presence_hosts = switch_core_strdup(profile->pool, val); } else if (!strcasecmp(var, "record-template")) { - profile->record_template = switch_core_strdup(profile->pool, val);; + profile->record_template = switch_core_strdup(profile->pool, val); } else if ((!strcasecmp(var, "inbound-no-media") || !strcasecmp(var, "inbound-bypass-media")) && switch_true(val)) { switch_set_flag(profile, TFLAG_INB_NOMEDIA); } else if (!strcasecmp(var, "inbound-late-negotiation") && switch_true(val)) { @@ -1584,9 +1592,12 @@ } else if (!strcasecmp(var, "disable-register") && switch_true(val)) { profile->mflags &= ~MFLAG_REGISTER; } else if (!strcasecmp(var, "manage-presence")) { - if (switch_true(val)) { - profile->pflags |= PFLAG_PRESENCE; - } + if (!strcasecmp(val, "passive")) { + profile->pres_type = PRES_TYPE_PASSIVE; + + } else if (switch_true(val)) { + profile->pres_type = PRES_TYPE_FULL; + } } else if (!strcasecmp(var, "unregister-on-options-fail")) { if (switch_true(val)) { profile->pflags |= PFLAG_UNREG_OPTIONS_FAIL; @@ -2086,17 +2097,22 @@ contact_host = switch_str_nil(contact->url_host); } - if (profile->pflags & PFLAG_PRESENCE) { - sql = switch_mprintf("insert into sip_dialogs values('%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q')", + if (profile->pres_type) { + sql = switch_mprintf("insert into sip_dialogs " + "(call_id,uuid,sip_to_user,sip_to_host,sip_from_user,sip_from_host,contact_user," + "contact_host,state,direction,user_agent,profile_name,hostname) " + "values('%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q')", call_id, switch_core_session_get_uuid(session), - to_user, to_host, from_user, from_host, contact_user, contact_host, astate, "outbound", user_agent); + to_user, to_host, from_user, from_host, contact_user, + contact_host, astate, "outbound", user_agent, + profile->name, mod_sofia_globals.hostname); switch_assert(sql); sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); } - } else if (status == 200 && (profile->pflags & PFLAG_PRESENCE)) { + } else if (status == 200 && (profile->pres_type)) { char *sql = NULL; sql = switch_mprintf("update sip_dialogs set state='%s' where uuid='%s';\n", astate, switch_core_session_get_uuid(session)); switch_assert(sql); @@ -3636,7 +3652,7 @@ su_free(profile->home, tmp); } - if (sofia_test_pflag(profile, PFLAG_PRESENCE)) { + if (profile->pres_type) { const char *user = switch_str_nil(sip->sip_from->a_url->url_user); const char *host = switch_str_nil(sip->sip_from->a_url->url_host); @@ -3709,7 +3725,7 @@ sofia_private->is_call++; tech_pvt->sofia_private = sofia_private; - if ((profile->pflags & PFLAG_PRESENCE)) { + if ((profile->pres_type)) { sofia_presence_set_chat_hash(tech_pvt, sip); } switch_copy_string(tech_pvt->sofia_private->uuid, switch_core_session_get_uuid(session), sizeof(tech_pvt->sofia_private->uuid)); @@ -3756,12 +3772,17 @@ } - if (profile->pflags & PFLAG_PRESENCE) { + if (profile->pres_type) { - sql = switch_mprintf("insert into sip_dialogs values('%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q')", + sql = switch_mprintf("insert into sip_dialogs " + "(call_id,uuid,sip_to_user,sip_to_host,sip_from_user,sip_from_host,contact_user," + "contact_host,state,direction,user_agent,profile_name,hostname) " + "values('%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q')", call_id, tech_pvt->sofia_private->uuid, - to_user, to_host, dialog_from_user, dialog_from_host, contact_user, contact_host, "confirmed", "inbound", user_agent); + to_user, to_host, dialog_from_user, dialog_from_host, + contact_user, contact_host, "confirmed", "inbound", user_agent, + profile->name, mod_sofia_globals.hostname); switch_assert(sql); sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); 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 Wed Sep 17 20:01:03 2008 @@ -1231,7 +1231,7 @@ tech_pvt->chat_from = tech_pvt->from_str; tech_pvt->chat_to = tech_pvt->dest; - if (tech_pvt->profile->pflags & PFLAG_PRESENCE) { + if (tech_pvt->profile->pres_type) { tech_pvt->hash_key = switch_core_session_strdup(tech_pvt->session, hash_key); switch_mutex_lock(tech_pvt->profile->flag_mutex); switch_core_hash_insert(tech_pvt->profile->chat_hash, tech_pvt->hash_key, tech_pvt); @@ -2715,18 +2715,24 @@ int sofia_glue_init_sql(sofia_profile_t *profile) { + char *test_sql = NULL; + char reg_sql[] = "CREATE TABLE sip_registrations (\n" " call_id VARCHAR(255),\n" " sip_user VARCHAR(255),\n" " sip_host VARCHAR(255),\n" + " presence_hosts VARCHAR(255),\n" " contact VARCHAR(1024),\n" " status VARCHAR(255),\n" " rpid VARCHAR(255),\n" " expires INTEGER,\n" " user_agent VARCHAR(255),\n" - " server_user VARCHAR(255),\n" - " server_host VARCHAR(255)\n" ");\n"; + " server_user VARCHAR(255),\n" + " server_host VARCHAR(255),\n" + " profile_name VARCHAR(255),\n" + " hostname VARCHAR(255)\n" + ");\n"; char dialog_sql[] = "CREATE TABLE sip_dialogs (\n" @@ -2740,7 +2746,9 @@ " contact_host VARCHAR(255),\n" " state VARCHAR(255),\n" " direction VARCHAR(255),\n" - " user_agent VARCHAR(255)\n" + " user_agent VARCHAR(255),\n" + " profile_name VARCHAR(255),\n" + " hostname VARCHAR(255)\n" ");\n"; char sub_sql[] = @@ -2750,6 +2758,7 @@ " sip_host VARCHAR(255),\n" " sub_to_user VARCHAR(255),\n" " sub_to_host VARCHAR(255),\n" + " presence_hosts VARCHAR(255),\n" " event VARCHAR(255),\n" " contact VARCHAR(1024),\n" " call_id VARCHAR(255),\n" @@ -2757,13 +2766,18 @@ " full_via VARCHAR(255),\n" " expires INTEGER,\n" " user_agent VARCHAR(255),\n" - " accept VARCHAR(255)\n" + " accept VARCHAR(255),\n" + " profile_name VARCHAR(255),\n" + " hostname VARCHAR(255)\n" ");\n"; char auth_sql[] = "CREATE TABLE sip_authentication (\n" " nonce VARCHAR(255),\n" - " expires INTEGER" ");\n"; + " expires INTEGER," + " profile_name VARCHAR(255),\n" + " hostname VARCHAR(255)\n" + ");\n"; if (profile->odbc_dsn) { #ifdef SWITCH_HAVE_ODBC @@ -2776,27 +2790,37 @@ } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Connected ODBC DSN: %s\n", profile->odbc_dsn); - - if (switch_odbc_handle_exec(profile->master_odbc, "select sip_user,user_agent,server_host from sip_registrations", NULL) != SWITCH_ODBC_SUCCESS) { + + if (switch_odbc_handle_exec(profile->master_odbc, "select hostname from sip_registrations", NULL) != SWITCH_ODBC_SUCCESS) { switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_registrations", NULL); switch_odbc_handle_exec(profile->master_odbc, reg_sql, NULL); } - if (switch_odbc_handle_exec(profile->master_odbc, "delete from sip_subscriptions where sip_user != '' or accept != ''", NULL) != - SWITCH_ODBC_SUCCESS) { + + test_sql = switch_mprintf("delete from sip_subscriptions where hostname='%q'", mod_sofia_globals.hostname); + + if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) { switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_subscriptions", NULL); switch_odbc_handle_exec(profile->master_odbc, sub_sql, NULL); } - if (switch_odbc_handle_exec(profile->master_odbc, "delete from sip_dialogs", NULL) != SWITCH_ODBC_SUCCESS) { + free(test_sql); + test_sql = switch_mprintf("delete from sip_dialogs where hostname='%q'", mod_sofia_globals.hostname); + + if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) { switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_dialogs", NULL); switch_odbc_handle_exec(profile->master_odbc, dialog_sql, NULL); } - if (switch_odbc_handle_exec(profile->master_odbc, "select nonce from sip_authentication", NULL) != SWITCH_ODBC_SUCCESS) { + free(test_sql); + test_sql = switch_mprintf("delete from sip_authentication where hostname='%q'", mod_sofia_globals.hostname); + + if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) { switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_authentication", NULL); switch_odbc_handle_exec(profile->master_odbc, auth_sql, NULL); } + free(test_sql); + #else switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ODBC IS NOT AVAILABLE!\n"); #endif @@ -2805,12 +2829,18 @@ return 0; } - switch_core_db_test_reactive(profile->master_db, "select sip_user,user_agent,server_host from sip_registrations", "DROP TABLE sip_registrations", reg_sql); - switch_core_db_test_reactive(profile->master_db, "delete from sip_subscriptions where sip_user != '' or accept != ''", - "DROP TABLE sip_subscriptions", sub_sql); - switch_core_db_test_reactive(profile->master_db, "delete from sip_dialogs", "DROP TABLE sip_dialogs", dialog_sql); - switch_core_db_test_reactive(profile->master_db, "select * from sip_authentication", "DROP TABLE sip_authentication", auth_sql); - + switch_core_db_test_reactive(profile->master_db, "select hostname from sip_registrations", "DROP TABLE sip_registrations", reg_sql); + + test_sql = switch_mprintf("delete from sip_subscriptions where hostname='%q'", mod_sofia_globals.hostname); + switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_subscriptions", sub_sql); + free(test_sql); + + test_sql = switch_mprintf("delete from sip_dialogs where hostname='%q'", mod_sofia_globals.hostname); + switch_core_db_test_reactive(profile->master_db, "delete from sip_dialogs", test_sql, dialog_sql); + free(test_sql); + test_sql = switch_mprintf("delete from sip_authentication where hostname='%q'", mod_sofia_globals.hostname); + switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_authentication", auth_sql); + free(test_sql); } #ifdef SWITCH_HAVE_ODBC 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 Wed Sep 17 20:01:03 2008 @@ -143,13 +143,16 @@ if (!mod_sofia_globals.profile_hash) return; - - if ((sql = switch_mprintf("select *,-1,'unavailable','unavailable' from sip_subscriptions where event='presence'"))) { + + if ((sql = switch_mprintf( + "select proto,sip_user,sip_host,sub_to_user,sub_to_host,event,contact,call_id,full_from," + "full_via,expires,user_agent,accept,profile_name" + ",-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)) { switch_hash_this(hi, NULL, NULL, &val); profile = (sofia_profile_t *) val; - if (!(profile->pflags & PFLAG_PRESENCE)) { + if (profile->pres_type != PRES_TYPE_FULL) { continue; } helper.profile = profile; @@ -272,19 +275,20 @@ } stream.write_function(&stream, "\r\n"); - - sql = switch_mprintf("select *,'%q' from sip_subscriptions where event='message-summary' and sub_to_user='%q' and sub_to_host='%q'", - stream.data, user, host); - + + sql = switch_mprintf("select proto,sip_user,sip_host,sub_to_user,sub_to_host,event,contact,call_id,full_from," + "full_via,expires,user_agent,accept,profile_name" + ",'%q','%q' from sip_subscriptions where event='message-summary' " + "and sub_to_user='%q' and (sub_to_host='%q' or presence_hosts like '%%%q%%')", + stream.data, host, user, host, host); switch_assert(sql != NULL); sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, sql, sofia_presence_mwi_callback, &h); - + switch_safe_free(sql); - - - sql = switch_mprintf("select sip_user,sip_host,contact,'%q' from sip_registrations where sip_user='%q' and sip_host='%q'", stream.data, user, host); + sql = switch_mprintf("select sip_user,sip_host,contact,profile_name,'%q' from sip_registrations where sip_user='%q' and sip_host='%q'", + stream.data, user, host); @@ -357,9 +361,14 @@ return; if (from) { - sql = switch_mprintf("select *,1,'%q','%q' from sip_subscriptions where event='presence' and full_from like '%%%q%%'", status, rpid, from); + sql = switch_mprintf( + "select proto,sip_user,sip_host,sub_to_user,sub_to_host,event,contact,call_id,full_from," + "full_via,expires,user_agent,accept,profile_name" + ",1,'%q','%q' from sip_subscriptions where event='presence' and full_from like '%%%q%%'", status, rpid, from); } else { - sql = switch_mprintf("select *,1,'%q','%q' from sip_subscriptions where event='presence'", status, rpid); + sql = switch_mprintf("select proto,sip_user,sip_host,sub_to_user,sub_to_host,event,contact,call_id,full_from," + "full_via,expires,user_agent,accept,profile_name" + ",1,'%q','%q' from sip_subscriptions where event='presence'", status, rpid); } switch_assert(sql != NULL); @@ -367,7 +376,7 @@ for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, NULL, NULL, &val); profile = (sofia_profile_t *) val; - if (!(profile->pflags & PFLAG_PRESENCE)) { + if (profile->pres_type != PRES_TYPE_FULL) { continue; } helper.profile = profile; @@ -445,16 +454,18 @@ } return; case SWITCH_EVENT_PRESENCE_IN: - sql = - switch_mprintf - ("select *,1,'%q','%q' from sip_subscriptions where (event='%q' or event='%q') and sub_to_user='%q' and sub_to_host='%q'", - status, rpid, event_type, alt_event_type, euser, host); + sql = switch_mprintf("select proto,sip_user,sip_host,sub_to_user,sub_to_host,event,contact,call_id,full_from," + "full_via,expires,user_agent,accept,profile_name" + ",1,'%q','%q','%q' from sip_subscriptions where (event='%q' or event='%q') and sub_to_user='%q' " + "and (sub_to_host='%q' or presence_hosts like '%%%q%%')", + status, rpid, host, event_type, alt_event_type, euser, host, host); break; case SWITCH_EVENT_PRESENCE_OUT: - sql = - switch_mprintf - ("select *,0,'%q','%q' from sip_subscriptions where (event='%q' or event='%q') and sub_to_user='%q' and sub_to_host='%q'", - status, rpid, event_type, alt_event_type, euser, host); + sql = switch_mprintf("select proto,sip_user,sip_host,sub_to_user,sub_to_host,event,contact,call_id,full_from," + "full_via,expires,user_agent,accept,profile_name" + ",0,'%q','%q','%q' from sip_subscriptions where (event='%q' or event='%q') " + "and sub_to_user='%q' and (sub_to_host='%q' or presence_hosts like '%%%q%%')", + status, rpid, host, event_type, alt_event_type, euser, host, host); break; default: break; @@ -467,7 +478,7 @@ for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, NULL, NULL, &val); profile = (sofia_profile_t *) val; - if (!(profile->pflags & PFLAG_PRESENCE)) { + if (profile->pres_type != PRES_TYPE_FULL) { continue; } @@ -818,23 +829,22 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char **columnNames) { struct presence_helper *helper = (struct presence_helper *) pArg; - sofia_profile_t *profile = helper->profile; char *pl = NULL; char *clean_id = NULL, *id = NULL; - uint32_t in = atoi(argv[13]); - char *status = argv[14]; - char *rpid = argv[15]; + uint32_t in = atoi(argv[14]); + char *status = argv[15]; + char *rpid = argv[16]; char *proto = argv[0]; char *user = argv[1]; char *host = argv[2]; char *sub_to_user = argv[3]; - char *sub_to_host = argv[4]; + char *sub_to_host = argv[17]; char *event = argv[5]; char *call_id = argv[7]; char *expires = argv[10]; char *user_agent = argv[11]; - //char *accept = argv[12]; + char *profile_name = argv[13]; nua_handle_t *nh; char *to = NULL; char *open; @@ -844,6 +854,15 @@ time_t exptime = switch_timestamp(NULL) + 3600; char exp[80] = ""; int is_dialog = 0; + sofia_profile_t *ext_profile = NULL, *profile = helper->profile; + + + if (profile_name && strcasecmp(profile_name, helper->profile->name)) { + if ((ext_profile = sofia_glue_find_profile(profile_name))) { + profile = ext_profile; + } + } + if (expires) { long tmp = atol(expires); @@ -854,7 +873,7 @@ if (!(nh = nua_handle_by_call_id(profile->nua, call_id))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Cannot find handle for %s\n", call_id); - return 0; + goto end; } if (!rpid) { @@ -1087,6 +1106,10 @@ nua_notify(nh, SIPTAG_SUBSCRIPTION_STATE_STR(exp), SIPTAG_EVENT_STR(event), SIPTAG_CONTENT_TYPE_STR(ct), SIPTAG_PAYLOAD_STR(pl), TAG_END()); end: + + if (ext_profile) { + sofia_glue_release_profile(ext_profile); + } switch_safe_free(id); switch_safe_free(clean_id); @@ -1102,14 +1125,15 @@ //char *user = argv[1]; //char *host = argv[2]; char *sub_to_user = argv[3]; - char *sub_to_host = argv[4]; + char *sub_to_host = argv[15]; 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]; - char *body = argv[13]; + char *profile_name = argv[13]; + char *body = argv[14]; char *exp; //sofia_profile_t *profile = NULL; char *id = NULL; @@ -1117,11 +1141,19 @@ int expire_sec = atoi(expires); //int *total = (int *) pArg; struct mwi_helper *h = (struct mwi_helper *) pArg; + sofia_profile_t *ext_profile = NULL, *profile = h->profile; + + if (profile_name && strcasecmp(profile_name, h->profile->name)) { + if ((ext_profile = sofia_glue_find_profile(profile_name))) { + profile = ext_profile; + } + } + if (!(nh = nua_handle_by_call_id(h->profile->nua, call_id))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find handle for %s\n", call_id); - return 0; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Cannot find handle for %s\n", call_id); + goto end; } id = switch_mprintf("sip:%s@%s", sub_to_user, sub_to_host); @@ -1139,6 +1171,13 @@ switch_safe_free(exp); h->total++; + + end: + + if (ext_profile) { + sofia_glue_release_profile(ext_profile); + } + return 0; } @@ -1151,17 +1190,25 @@ char *sub_to_host = argv[1]; char *event = "message-summary"; char *contact, *o_contact = argv[2]; - char *body = argv[3]; + char *profile_name = argv[3]; + char *body = argv[4]; char *id = NULL; nua_handle_t *nh; struct mwi_helper *h = (struct mwi_helper *) pArg; + sofia_profile_t *ext_profile = NULL, *profile = h->profile; + + if (profile_name && strcasecmp(profile_name, h->profile->name)) { + if ((ext_profile = sofia_glue_find_profile(profile_name))) { + profile = ext_profile; + } + } id = switch_mprintf("sip:%s@%s", sub_to_user, sub_to_host); contact = sofia_glue_get_url_from_contact(o_contact, 1); - nh = nua_handle(h->profile->nua, NULL, NUTAG_URL(contact), SIPTAG_FROM_STR(id), SIPTAG_TO_STR(id), SIPTAG_CONTACT_STR(h->profile->url), TAG_END()); + nh = nua_handle(profile->nua, NULL, NUTAG_URL(contact), SIPTAG_FROM_STR(id), SIPTAG_TO_STR(id), SIPTAG_CONTACT_STR(h->profile->url), TAG_END()); nua_notify(nh, NUTAG_NEWSUB(1), @@ -1171,6 +1218,10 @@ switch_safe_free(contact); switch_safe_free(id); + if (ext_profile) { + sofia_glue_release_profile(ext_profile); + } + return 0; } @@ -1383,8 +1434,8 @@ sql = switch_mprintf("delete from sip_subscriptions where call_id='%q'", call_id); } else { sql = switch_mprintf("delete from sip_subscriptions where " - "proto='%q' and sip_user='%q' and sip_host='%q' and sub_to_user='%q' and sub_to_host='%q' and event='%q'", - proto, from_user, from_host, to_user, to_host, event); + "proto='%q' and sip_user='%q' and sip_host='%q' and sub_to_user='%q' and sub_to_host='%q' and event='%q' and hostname='%q'", + proto, from_user, from_host, to_user, to_host, event, mod_sofia_globals.hostname); } @@ -1402,9 +1453,14 @@ switch_snprintf(accept + strlen(accept), sizeof(accept) - strlen(accept), "%s%s ", ap->ac_type, ap->ac_next ? "," : ""); ap = ap->ac_next; } - sql = switch_mprintf("insert into sip_subscriptions values ('%q','%q','%q','%q','%q','%q','%q','%q','%q','%q',%ld,'%q','%q')", - proto, from_user, from_host, to_user, to_host, event, contact_str, call_id, full_from, full_via, exp, full_agent, accept); - + sql = switch_mprintf("insert into sip_subscriptions " + "(proto,sip_user,sip_host,sub_to_user,sub_to_host,presence_hosts,event,contact,call_id,full_from," + "full_via,expires,user_agent,accept,profile_name,hostname) " + "values ('%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q',%ld,'%q','%q','%q','%q')", + proto, from_user, from_host, to_user, to_host, profile->presence_hosts ? profile->presence_hosts : to_host, + event, contact_str, call_id, full_from, full_via, exp, full_agent, accept, profile->name,mod_sofia_globals.hostname); + + switch_assert(sql != NULL); sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); @@ -1450,7 +1506,10 @@ switch_safe_free(sstr); - if ((sql = switch_mprintf("select * from sip_subscriptions where sip_user='%q' and sip_host='%q'", to_user, to_host))) { + if ((sql = switch_mprintf( + "select proto,sip_user,sip_host,sub_to_user,sub_to_host,event,contact,call_id,full_from," + "full_via,expires,user_agent,accept,profile_name" + " from sip_subscriptions where sip_user='%q' and sip_host='%q'", to_user, to_host))) { sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, sql, sofia_presence_sub_reg_callback, profile); switch_safe_free(sql); 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 Wed Sep 17 20:01:03 2008 @@ -286,7 +286,7 @@ switch_event_t *s_event; sofia_profile_t *profile = (sofia_profile_t *) pArg; - if (argc > 10 && atoi(argv[10]) == 1) { + if (argc > 11 && atoi(argv[11]) == 1) { sofia_reg_send_reboot(profile, argv[1], argv[2], argv[3], argv[7]); } @@ -322,15 +322,16 @@ host = "none"; } - switch_snprintf(sql, sizeof(sql), "select *,%d from sip_registrations where call_id='%s' or (sip_user='%s' and sip_host='%s')", - reboot, call_id, user, host); + switch_snprintf(sql, sizeof(sql), "select call_id,sip_user,sip_host,contact,status,rpid,expires,user_agent,server_user,server_host,profile_name" + ",%d from sip_registrations where call_id='%s' or (sip_user='%s' and sip_host='%s') and hostname='%q'", + reboot, call_id, user, host, mod_sofia_globals.hostname); switch_mutex_lock(profile->ireg_mutex); sofia_glue_execute_sql_callback(profile, SWITCH_TRUE, NULL, sql, sofia_reg_del_callback, profile); switch_mutex_unlock(profile->ireg_mutex); - switch_snprintf(sql, sizeof(sql), "delete from sip_registrations where call_id='%s' or (sip_user='%s' and sip_host='%s')", - call_id, user, host); + switch_snprintf(sql, sizeof(sql), "delete from sip_registrations where call_id='%s' or (sip_user='%s' and sip_host='%s') and hostname='%q'", + call_id, user, host, mod_sofia_globals.hostname); sofia_glue_execute_sql(profile, &psql, SWITCH_FALSE); switch_safe_free(user); @@ -361,24 +362,28 @@ switch_mutex_lock(profile->ireg_mutex); if (now) { - switch_snprintf(sql, sizeof(sql), "select *,%d from sip_registrations where expires > 0 and expires <= %ld", reboot, (long) now); + switch_snprintf(sql, sizeof(sql), "select call_id,sip_user,sip_host,contact,status,rpid,expires,user_agent,server_user,server_host,profile_name" + ",%d from sip_registrations where expires > 0 and expires <= %ld", reboot, (long) now); } else { - switch_snprintf(sql, sizeof(sql), "select *,%d from sip_registrations where expires > 0", reboot); + switch_snprintf(sql, sizeof(sql), "select call_id,sip_user,sip_host,contact,status,rpid,expires,user_agent,server_user,server_host,profile_name" + ",%d from sip_registrations where expires > 0", reboot); } sofia_glue_execute_sql_callback(profile, SWITCH_TRUE, NULL, sql, sofia_reg_del_callback, profile); if (now) { - switch_snprintf(sql, sizeof(sql), "delete from sip_registrations where expires > 0 and expires <= %ld", (long) now); + switch_snprintf(sql, sizeof(sql), "delete from sip_registrations where expires > 0 and expires <= %ld and hostname='%q'", + (long) now, mod_sofia_globals.hostname); } else { - switch_snprintf(sql, sizeof(sql), "delete from sip_registrations where expires > 0"); + switch_snprintf(sql, sizeof(sql), "delete from sip_registrations where expires > 0 and hostname='%q'", mod_sofia_globals.hostname); } sofia_glue_actually_execute_sql(profile, SWITCH_FALSE, sql, NULL); if (now) { - switch_snprintf(sql, sizeof(sql), "delete from sip_authentication where expires > 0 and expires <= %ld", (long) now); + switch_snprintf(sql, sizeof(sql), "delete from sip_authentication where expires > 0 and expires <= %ld and hostname='%q'", + (long) now, mod_sofia_globals.hostname); } else { - switch_snprintf(sql, sizeof(sql), "delete from sip_authentication where expires > 0"); + switch_snprintf(sql, sizeof(sql), "delete from sip_authentication where expires > 0 and hostname='%q'", mod_sofia_globals.hostname); } sofia_glue_actually_execute_sql(profile, SWITCH_FALSE, sql, NULL); @@ -386,24 +391,27 @@ if (now) { - switch_snprintf(sql, sizeof(sql), "select call_id from sip_subscriptions where expires > 0 and expires <= %ld", (long) now); + switch_snprintf(sql, sizeof(sql), "select call_id from sip_subscriptions where expires > 0 and expires <= %ld and hostname='%q'", + (long) now, mod_sofia_globals.hostname); } else { - switch_snprintf(sql, sizeof(sql), "select call_id from sip_subscriptions where expires > 0"); + switch_snprintf(sql, sizeof(sql), "select call_id from sip_subscriptions where expires > 0 and hostname='%q'", mod_sofia_globals.hostname); } sofia_glue_execute_sql_callback(profile, SWITCH_TRUE, NULL, sql, sofia_sub_del_callback, profile); if (now) { - switch_snprintf(sql, sizeof(sql), "delete from sip_subscriptions where expires > 0 and expires <= %ld", (long) now); + switch_snprintf(sql, sizeof(sql), "delete from sip_subscriptions where expires > 0 and expires <= %ld and hostname='%q'", + (long) now, mod_sofia_globals.hostname); } else { - switch_snprintf(sql, sizeof(sql), "delete from sip_subscriptions where expires > 0"); + switch_snprintf(sql, sizeof(sql), "delete from sip_subscriptions where expires > 0 and hostname='%q'", mod_sofia_globals.hostname); } sofia_glue_actually_execute_sql(profile, SWITCH_FALSE, sql, NULL); if (now) { - switch_snprintf(sql, sizeof(sql), "select * from sip_registrations where status like '%%AUTO-NAT%%' or status like '%%UDP-NAT%%'"); + switch_snprintf(sql, sizeof(sql), "select call_id,sip_user,sip_host,contact,status,rpid,expires,user_agent,server_user,server_host,profile_name" + " from sip_registrations where status like '%%AUTO-NAT%%' or status like '%%UDP-NAT%%'"); sofia_glue_execute_sql_callback(profile, SWITCH_TRUE, NULL, sql, sofia_reg_nat_callback, profile); } @@ -425,7 +433,8 @@ cbt.len = len; if (host) { - switch_snprintf(sql, sizeof(sql), "select contact from sip_registrations where sip_user='%s' and sip_host='%s'", user, host); + switch_snprintf(sql, sizeof(sql), "select contact from sip_registrations where sip_user='%s' and (sip_host='%s' or presence_hosts like '%%%q%%')" + , user, host, host); } else { switch_snprintf(sql, sizeof(sql), "select contact from sip_registrations where sip_user='%s'", user); } @@ -451,7 +460,8 @@ switch_uuid_get(&uuid); switch_uuid_format(uuid_str, &uuid); - sql = switch_mprintf("insert into sip_authentication (nonce, expires) values('%q', %ld)", uuid_str, switch_timestamp(NULL) + profile->nonce_ttl); + sql = switch_mprintf("insert into sip_authentication (nonce,expires,profile_name,hostname) " + "values('%q', %ld, '%q', '%q')", uuid_str, switch_timestamp(NULL) + profile->nonce_ttl, profile->name, mod_sofia_globals.hostname); switch_assert(sql != NULL); sofia_glue_actually_execute_sql(profile, SWITCH_FALSE, sql, profile->ireg_mutex); switch_safe_free(sql); @@ -754,14 +764,20 @@ if (multi_reg) { sql = switch_mprintf("delete from sip_registrations where call_id='%q'", call_id); } else { - sql = switch_mprintf("delete from sip_registrations where sip_user='%q' and sip_host='%q'", to_user, reg_host); + sql = switch_mprintf("delete from sip_registrations where sip_user='%q' and sip_host='%q' and hostname='%q'", + to_user, reg_host, mod_sofia_globals.hostname); } switch_mutex_lock(profile->ireg_mutex); sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); switch_find_local_ip(guess_ip4, sizeof(guess_ip4), AF_INET); - sql = switch_mprintf("insert into sip_registrations values ('%q', '%q','%q','%q','%q', '%q', %ld, '%q', '%q', '%q')", call_id, - to_user, reg_host, contact_str, reg_desc, rpid, (long) switch_timestamp(NULL) + (long) exptime * 2, agent, from_user, guess_ip4); + sql = switch_mprintf("insert into sip_registrations " + "(call_id,sip_user,sip_host,presence_hosts,contact,status,rpid,expires,user_agent,server_user,server_host,profile_name,hostname) " + "values ('%q','%q', '%q','%q','%q','%q', '%q', %ld, '%q', '%q', '%q', '%q', '%q')", + call_id, to_user, reg_host, profile->presence_hosts ? profile->presence_hosts : reg_host, + contact_str, reg_desc, rpid, (long) switch_timestamp(NULL) + (long) exptime * 2, + agent, from_user, guess_ip4, profile->name, mod_sofia_globals.hostname); + if (sql) { sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); } @@ -771,6 +787,7 @@ switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "profile-name", profile->name); switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "from-user", to_user); switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "from-host", reg_host); + switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "presence-hosts", profile->presence_hosts ? profile->presence_hosts : reg_host); switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "contact", contact_str); switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "call-id", call_id); switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "rpid", rpid); @@ -817,11 +834,13 @@ } switch_safe_free(icontact); } else { - if ((sql = switch_mprintf("delete from sip_subscriptions where sip_user='%q' and sip_host='%q'", to_user, reg_host))) { + if ((sql = switch_mprintf("delete from sip_subscriptions where sip_user='%q' and sip_host='%q' and hostname='%q'", to_user, reg_host, + mod_sofia_globals.hostname))) { sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); } - if ((sql = switch_mprintf("delete from sip_registrations where sip_user='%q' and sip_host='%q'", to_user, reg_host))) { + if ((sql = switch_mprintf("delete from sip_registrations where sip_user='%q' and sip_host='%q' and hostname='%q'", to_user, reg_host, + mod_sofia_globals.hostname))) { sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); } }

1 0

[commit] r9581 - freeswitch/trunk/libs/apr-util
by Freeswitch SVN 17 Sep '08

17 Sep '08

Author: mikej Date: Wed Sep 17 18:57:33 2008 New Revision: 9581 Modified: freeswitch/trunk/libs/apr-util/configure.gnu Log: avoid linking conflicting sqlite libraries Modified: freeswitch/trunk/libs/apr-util/configure.gnu ============================================================================== --- freeswitch/trunk/libs/apr-util/configure.gnu (original) +++ freeswitch/trunk/libs/apr-util/configure.gnu Wed Sep 17 18:57:33 2008 @@ -1,3 +1,3 @@ #! /bin/sh -./configure "$@" --with-apr=../apr --disable-shared --with-pic +./configure "$@" --with-apr=../apr --disable-shared --with-pic --without-sqlite2 --without-sqlite3

1 0

[commit] r9580 - in freeswitch/trunk/src/mod/languages: mod_mono mod_mono_managed
by Freeswitch SVN 17 Sep '08

17 Sep '08

Author: michaelgg Date: Wed Sep 17 18:46:07 2008 New Revision: 9580 Modified: freeswitch/trunk/src/mod/languages/mod_mono/freeswitch_mono.cpp freeswitch/trunk/src/mod/languages/mod_mono/freeswitch_wrap.cxx freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.vcproj freeswitch/trunk/src/mod/languages/mod_mono_managed/mod_mono_managed.csproj freeswitch/trunk/src/mod/languages/mod_mono_managed/swig.cs Log: Fixup mono build on Windows Modified: freeswitch/trunk/src/mod/languages/mod_mono/freeswitch_mono.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_mono/freeswitch_mono.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_mono/freeswitch_mono.cpp Wed Sep 17 18:46:07 2008 @@ -28,7 +28,7 @@ * freeswitch_mono.cpp -- Mono-specific CoreSession subclass * */ - + #include <switch.h> #include <switch_cpp.h> #include <glib.h> Modified: freeswitch/trunk/src/mod/languages/mod_mono/freeswitch_wrap.cxx ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_mono/freeswitch_wrap.cxx (original) +++ freeswitch/trunk/src/mod/languages/mod_mono/freeswitch_wrap.cxx Wed Sep 17 18:46:07 2008 @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -71,12 +71,6 @@ # endif #endif -#ifndef SWIG_MSC_UNSUPPRESS_4505 -# if defined(_MSC_VER) -# pragma warning(disable : 4505) /* unreferenced local function has been removed */ -# endif -#endif - #ifndef SWIGUNUSEDPARM # ifdef __cplusplus # define SWIGUNUSEDPARM(p) @@ -201,7 +195,7 @@ static void SWIGUNUSED SWIG_CSharpSetPendingException(SWIG_CSharpExceptionCodes code, const char *msg) { SWIG_CSharpExceptionCallback_t callback = SWIG_csharp_exceptions[SWIG_CSharpApplicationException].callback; - if ((size_t)code < sizeof(SWIG_csharp_exceptions)/sizeof(SWIG_CSharpException_t)) { + if (code >=0 && (size_t)code < sizeof(SWIG_csharp_exceptions)/sizeof(SWIG_CSharpException_t)) { callback = SWIG_csharp_exceptions[code].callback; } callback(msg); @@ -209,7 +203,7 @@ static void SWIGUNUSED SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpExceptionArgumentCodes code, const char *msg, const char *param_name) { SWIG_CSharpExceptionArgumentCallback_t callback = SWIG_csharp_exceptions_argument[SWIG_CSharpArgumentException].callback; - if ((size_t)code < sizeof(SWIG_csharp_exceptions_argument)/sizeof(SWIG_CSharpExceptionArgument_t)) { + if (code >=0 && (size_t)code < sizeof(SWIG_csharp_exceptions_argument)/sizeof(SWIG_CSharpExceptionArgument_t)) { callback = SWIG_csharp_exceptions_argument[code].callback; } callback(msg, param_name); @@ -289,6 +283,7 @@ char *result = 0 ; result = (char *) "27880"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -299,6 +294,7 @@ char *result = 0 ; result = (char *) ".1.3.6.1.4.1.27880"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -309,6 +305,7 @@ char *result = 0 ; result = (char *) "543"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -319,6 +316,7 @@ int result; result = (int) 1; + jresult = result; return jresult; } @@ -329,6 +327,7 @@ int result; result = (int) 1; + jresult = result; return jresult; } @@ -339,6 +338,7 @@ char *result = 0 ; result = (char *) "\0"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -349,6 +349,7 @@ char *result = 0 ; result = (char *) "\33["; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -359,6 +360,7 @@ char result; result = (char) 'H'; + jresult = result; return jresult; } @@ -369,6 +371,7 @@ char *result = 0 ; result = (char *) "H"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -379,6 +382,7 @@ char result; result = (char) '1'; + jresult = result; return jresult; } @@ -389,6 +393,7 @@ char *result = 0 ; result = (char *) "1"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -399,6 +404,7 @@ char *result = 0 ; result = (char *) "K"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -409,6 +415,7 @@ char result; result = (char) '2'; + jresult = result; return jresult; } @@ -419,6 +426,7 @@ char result; result = (char) 'J'; + jresult = result; return jresult; } @@ -429,6 +437,7 @@ char *result = 0 ; result = (char *) "2J"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -439,6 +448,7 @@ char *result = 0 ; result = (char *) ";"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -449,6 +459,7 @@ char *result = 0 ; result = (char *) "m"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -459,6 +470,7 @@ char *result = 0 ; result = (char *) "30"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -469,6 +481,7 @@ char *result = 0 ; result = (char *) "31"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -479,6 +492,7 @@ char *result = 0 ; result = (char *) "32"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -489,6 +503,7 @@ char *result = 0 ; result = (char *) "33"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -499,6 +514,7 @@ char *result = 0 ; result = (char *) "34"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -509,6 +525,7 @@ char *result = 0 ; result = (char *) "35"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -519,6 +536,7 @@ char *result = 0 ; result = (char *) "36"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -529,6 +547,7 @@ char *result = 0 ; result = (char *) "37"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -539,6 +558,7 @@ char *result = 0 ; result = (char *) "40"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -549,6 +569,7 @@ char *result = 0 ; result = (char *) "41"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -559,6 +580,7 @@ char *result = 0 ; result = (char *) "42"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -569,6 +591,7 @@ char *result = 0 ; result = (char *) "43"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -579,6 +602,7 @@ char *result = 0 ; result = (char *) "44"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -589,6 +613,7 @@ char *result = 0 ; result = (char *) "45"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -599,6 +624,7 @@ char *result = 0 ; result = (char *) "46"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -609,6 +635,7 @@ char *result = 0 ; result = (char *) "47"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -619,6 +646,7 @@ char *result = 0 ; result = (char *) "\33[30m"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -629,6 +657,7 @@ char *result = 0 ; result = (char *) "\33[31m"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -639,6 +668,7 @@ char *result = 0 ; result = (char *) "\33[32m"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -649,6 +679,7 @@ char *result = 0 ; result = (char *) "\33[33m"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -659,6 +690,7 @@ char *result = 0 ; result = (char *) "\33[34m"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -669,6 +701,7 @@ char *result = 0 ; result = (char *) "\33[35m"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -679,6 +712,7 @@ char *result = 0 ; result = (char *) "\33[36m"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -689,6 +723,7 @@ char *result = 0 ; result = (char *) "\33[37m"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -699,6 +734,7 @@ char *result = 0 ; result = (char *) "\33[40m"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -709,6 +745,7 @@ char *result = 0 ; result = (char *) "\33[41m"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -719,6 +756,7 @@ char *result = 0 ; result = (char *) "\33[42m"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -729,6 +767,7 @@ char *result = 0 ; result = (char *) "\33[43m"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -739,6 +778,7 @@ char *result = 0 ; result = (char *) "\33[44m"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -749,6 +789,7 @@ char *result = 0 ; result = (char *) "\33[45m"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -759,6 +800,7 @@ char *result = 0 ; result = (char *) "\33[46m"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -769,6 +811,7 @@ char *result = 0 ; result = (char *) "\33[47m"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -779,6 +822,7 @@ char *result = 0 ; result = (char *) "\33[H"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -789,6 +833,7 @@ char *result = 0 ; result = (char *) "\33[1"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -799,6 +844,7 @@ char *result = 0 ; result = (char *) "\33[K"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -809,6 +855,7 @@ char *result = 0 ; result = (char *) "\33[2J\33[H"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -819,6 +866,7 @@ int result; result = (int) 2000; + jresult = result; return jresult; } @@ -829,6 +877,7 @@ int result; result = (int) 192000; + jresult = result; return jresult; } @@ -839,6 +888,7 @@ char *result = 0 ; result = (char *) "/"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -849,6 +899,7 @@ char *result = 0 ; result = (char *) "://"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -859,6 +910,7 @@ char *result = 0 ; result = (char *) "read_result"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -869,6 +921,7 @@ char *result = 0 ; result = (char *) "copy_xml_cdr"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -879,6 +932,7 @@ char *result = 0 ; result = (char *) "current_application"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -889,6 +943,7 @@ char *result = 0 ; result = (char *) "proto_specific_hangup_cause"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -899,6 +954,7 @@ char *result = 0 ; result = (char *) "execute_on_answer"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -909,6 +965,7 @@ char *result = 0 ; result = (char *) "execute_on_ring"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -919,6 +976,7 @@ char *result = 0 ; result = (char *) "call_timeout"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -929,6 +987,7 @@ char *result = 0 ; result = (char *) "holding_uuid"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -939,6 +998,7 @@ char *result = 0 ; result = (char *) "api_after_bridge"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -949,6 +1009,7 @@ char *result = 0 ; result = (char *) "api_hangup_hook"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -959,6 +1020,7 @@ char *result = 0 ; result = (char *) "process_cdr"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -969,6 +1031,7 @@ char *result = 0 ; result = (char *) "bridge_channel"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -979,6 +1042,7 @@ char *result = 0 ; result = (char *) "channel_name"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -989,6 +1053,18 @@ char *result = 0 ; result = (char *) "bridge_uuid"; + + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + +SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CONTINUE_ON_FAILURE_VARIABLE_get() { + char * jresult ; + char *result = 0 ; + + result = (char *) "continue_on_fail"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -999,6 +1075,7 @@ char *result = 0 ; result = (char *) "playback_terminators"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1009,6 +1086,7 @@ char *result = 0 ; result = (char *) "cache_speech_handles"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1019,6 +1097,7 @@ char *result = 0 ; result = (char *) "__cache_speech_handles_obj__"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1029,6 +1108,7 @@ char *result = 0 ; result = (char *) "bypass_media"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1039,6 +1119,7 @@ char *result = 0 ; result = (char *) "proxy_media"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1049,6 +1130,7 @@ char *result = 0 ; result = (char *) "endpoint_disposition"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1059,6 +1141,7 @@ char *result = 0 ; result = (char *) "hold_music"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1069,6 +1152,7 @@ char *result = 0 ; result = (char *) "export_vars"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1079,6 +1163,7 @@ char *result = 0 ; result = (char *) "switch_r_sdp"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1089,6 +1174,7 @@ char *result = 0 ; result = (char *) "switch_l_sdp"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1099,6 +1185,7 @@ char *result = 0 ; result = (char *) "switch_m_sdp"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1109,6 +1196,7 @@ char *result = 0 ; result = (char *) "bridge_to"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1119,6 +1207,7 @@ char *result = 0 ; result = (char *) "signal_bridge_to"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1129,6 +1218,7 @@ char *result = 0 ; result = (char *) "signal_bond"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1139,6 +1229,7 @@ char *result = 0 ; result = (char *) "originator"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1149,6 +1240,7 @@ char *result = 0 ; result = (char *) "originator_codec"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1159,6 +1251,7 @@ char *result = 0 ; result = (char *) "local_media_ip"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1169,6 +1262,7 @@ char *result = 0 ; result = (char *) "local_media_port"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1179,6 +1273,7 @@ char *result = 0 ; result = (char *) "remote_media_ip"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1189,6 +1284,7 @@ char *result = 0 ; result = (char *) "remote_media_port"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1199,6 +1295,7 @@ char *result = 0 ; result = (char *) "remote_video_ip"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1209,6 +1306,7 @@ char *result = 0 ; result = (char *) "remote_video_port"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1219,6 +1317,7 @@ char *result = 0 ; result = (char *) "local_video_ip"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1229,6 +1328,7 @@ char *result = 0 ; result = (char *) "local_video_port"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1239,6 +1339,7 @@ char *result = 0 ; result = (char *) "hangup_after_bridge"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1249,6 +1350,7 @@ char *result = 0 ; result = (char *) "exec_after_bridge_app"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1259,6 +1361,7 @@ char *result = 0 ; result = (char *) "exec_after_bridge_arg"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1269,6 +1372,7 @@ char *result = 0 ; result = (char *) "max_forwards"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1279,6 +1383,7 @@ char *result = 0 ; result = (char *) "disable_app_log"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1289,6 +1394,7 @@ char *result = 0 ; result = (char *) "speech"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1299,6 +1405,7 @@ char *result = 0 ; result = (char *) "uuid_bridge"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -1309,6 +1416,7 @@ int result; result = (int) 8; + jresult = result; return jresult; } @@ -1321,6 +1429,7 @@ arg1 = (switch_dtmf_t *)jarg1; arg2 = (char)jarg2; if (arg1) (arg1)->digit = arg2; + } @@ -1343,6 +1452,7 @@ arg1 = (switch_dtmf_t *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->duration = arg2; + } @@ -1373,6 +1483,7 @@ arg1 = (switch_dtmf_t *)jarg1; delete arg1; + } @@ -1383,6 +1494,7 @@ arg1 = (switch_bitpack_t *)jarg1; arg2 = (switch_byte_t *)jarg2; if (arg1) (arg1)->buf = arg2; + } @@ -1405,6 +1517,7 @@ arg1 = (switch_bitpack_t *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->buflen = arg2; + } @@ -1427,6 +1540,7 @@ arg1 = (switch_bitpack_t *)jarg1; arg2 = (switch_byte_t *)jarg2; if (arg1) (arg1)->cur = arg2; + } @@ -1449,6 +1563,7 @@ arg1 = (switch_bitpack_t *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->bytes = arg2; + } @@ -1471,6 +1586,7 @@ arg1 = (switch_bitpack_t *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->bits_tot = arg2; + } @@ -1493,6 +1609,7 @@ arg1 = (switch_bitpack_t *)jarg1; arg2 = (switch_byte_t)jarg2; if (arg1) (arg1)->bits_cur = arg2; + } @@ -1515,6 +1632,7 @@ arg1 = (switch_bitpack_t *)jarg1; arg2 = (switch_byte_t)jarg2; if (arg1) (arg1)->bits_rem = arg2; + } @@ -1537,6 +1655,7 @@ arg1 = (switch_bitpack_t *)jarg1; arg2 = (switch_byte_t)jarg2; if (arg1) (arg1)->frame_bits = arg2; + } @@ -1559,6 +1678,7 @@ arg1 = (switch_bitpack_t *)jarg1; arg2 = (switch_byte_t)jarg2; if (arg1) (arg1)->shiftby = arg2; + } @@ -1581,6 +1701,7 @@ arg1 = (switch_bitpack_t *)jarg1; arg2 = (switch_byte_t)jarg2; if (arg1) (arg1)->this_byte = arg2; + } @@ -1603,6 +1724,7 @@ arg1 = (switch_bitpack_t *)jarg1; arg2 = (switch_byte_t)jarg2; if (arg1) (arg1)->under = arg2; + } @@ -1625,6 +1747,7 @@ arg1 = (switch_bitpack_t *)jarg1; arg2 = (switch_byte_t)jarg2; if (arg1) (arg1)->over = arg2; + } @@ -1647,6 +1770,7 @@ arg1 = (switch_bitpack_t *)jarg1; arg2 = (switch_bitpack_mode_t)jarg2; if (arg1) (arg1)->mode = arg2; + } @@ -1677,6 +1801,7 @@ arg1 = (switch_bitpack_t *)jarg1; delete arg1; + } @@ -1995,6 +2120,7 @@ arg1 = (switch_directories *)jarg1; delete arg1; + } @@ -2003,6 +2129,7 @@ arg1 = (switch_directories *)jarg1; SWITCH_GLOBAL_dirs = *arg1; + } @@ -2021,6 +2148,7 @@ int result; result = (int) 32; + jresult = result; return jresult; } @@ -2031,6 +2159,7 @@ int result; result = (int) 240*1024; + jresult = result; return jresult; } @@ -2041,6 +2170,7 @@ int result; result = (int) 120; + jresult = result; return jresult; } @@ -2051,6 +2181,7 @@ int result; result = (int) 10; + jresult = result; return jresult; } @@ -2061,6 +2192,7 @@ int result; result = (int) 32; + jresult = result; return jresult; } @@ -2071,6 +2203,7 @@ int result; result = (int) 2; + jresult = result; return jresult; } @@ -2081,6 +2214,7 @@ int result; result = (int) (2*32*(120+10)); + jresult = result; return jresult; } @@ -2091,6 +2225,7 @@ int result; result = (int) 50; + jresult = result; return jresult; } @@ -2101,6 +2236,7 @@ int result; result = (int) 30; + jresult = result; return jresult; } @@ -2111,6 +2247,7 @@ int result; result = (int) 100000; + jresult = result; return jresult; } @@ -2121,6 +2258,7 @@ int result; result = (int) 1024*8; + jresult = result; return jresult; } @@ -2131,6 +2269,7 @@ int result; result = (int) 13; + jresult = result; return jresult; } @@ -2143,6 +2282,7 @@ arg1 = (switch_rtp_hdr_t *)jarg1; arg2 = (unsigned int)jarg2; if (arg1) (arg1)->version = arg2; + } @@ -2165,6 +2305,7 @@ arg1 = (switch_rtp_hdr_t *)jarg1; arg2 = (unsigned int)jarg2; if (arg1) (arg1)->p = arg2; + } @@ -2187,6 +2328,7 @@ arg1 = (switch_rtp_hdr_t *)jarg1; arg2 = (unsigned int)jarg2; if (arg1) (arg1)->x = arg2; + } @@ -2209,6 +2351,7 @@ arg1 = (switch_rtp_hdr_t *)jarg1; arg2 = (unsigned int)jarg2; if (arg1) (arg1)->cc = arg2; + } @@ -2231,6 +2374,7 @@ arg1 = (switch_rtp_hdr_t *)jarg1; arg2 = (unsigned int)jarg2; if (arg1) (arg1)->m = arg2; + } @@ -2253,6 +2397,7 @@ arg1 = (switch_rtp_hdr_t *)jarg1; arg2 = (unsigned int)jarg2; if (arg1) (arg1)->pt = arg2; + } @@ -2275,6 +2420,7 @@ arg1 = (switch_rtp_hdr_t *)jarg1; arg2 = (unsigned int)jarg2; if (arg1) (arg1)->seq = arg2; + } @@ -2297,6 +2443,7 @@ arg1 = (switch_rtp_hdr_t *)jarg1; arg2 = (unsigned int)jarg2; if (arg1) (arg1)->ts = arg2; + } @@ -2319,6 +2466,7 @@ arg1 = (switch_rtp_hdr_t *)jarg1; arg2 = (unsigned int)jarg2; if (arg1) (arg1)->ssrc = arg2; + } @@ -2349,6 +2497,7 @@ arg1 = (switch_rtp_hdr_t *)jarg1; delete arg1; + } @@ -2359,6 +2508,7 @@ arg1 = (switch_input_args_t *)jarg1; arg2 = (switch_input_callback_function_t)jarg2; if (arg1) (arg1)->input_callback = arg2; + } @@ -2381,6 +2531,7 @@ arg1 = (switch_input_args_t *)jarg1; arg2 = (void *)jarg2; if (arg1) (arg1)->buf = arg2; + } @@ -2403,6 +2554,7 @@ arg1 = (switch_input_args_t *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->buflen = arg2; + } @@ -2425,6 +2577,7 @@ arg1 = (switch_input_args_t *)jarg1; arg2 = (switch_read_frame_callback_function_t)jarg2; if (arg1) (arg1)->read_frame_callback = arg2; + } @@ -2447,6 +2600,7 @@ arg1 = (switch_input_args_t *)jarg1; arg2 = (void *)jarg2; if (arg1) (arg1)->user_data = arg2; + } @@ -2477,6 +2631,7 @@ arg1 = (switch_input_args_t *)jarg1; delete arg1; + } @@ -2485,6 +2640,7 @@ int result; result = (int) 1; + jresult = result; return jresult; } @@ -2497,6 +2653,7 @@ arg1 = (switch_loadable_module_function_table_t *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->switch_api_version = arg2; + } @@ -2519,6 +2676,7 @@ arg1 = (switch_loadable_module_function_table_t *)jarg1; arg2 = (switch_module_load_t)jarg2; if (arg1) (arg1)->load = arg2; + } @@ -2541,6 +2699,7 @@ arg1 = (switch_loadable_module_function_table_t *)jarg1; arg2 = (switch_module_shutdown_t)jarg2; if (arg1) (arg1)->shutdown = arg2; + } @@ -2563,6 +2722,7 @@ arg1 = (switch_loadable_module_function_table_t *)jarg1; arg2 = (switch_module_runtime_t)jarg2; if (arg1) (arg1)->runtime = arg2; + } @@ -2593,6 +2753,7 @@ arg1 = (switch_loadable_module_function_table_t *)jarg1; delete arg1; + } @@ -2885,6 +3046,7 @@ int result; result = (int) 0; + jresult = result; return jresult; } @@ -2895,6 +3057,7 @@ int result; result = (int) 1; + jresult = result; return jresult; } @@ -2905,6 +3068,7 @@ int result; result = (int) 2; + jresult = result; return jresult; } @@ -2915,6 +3079,7 @@ int result; result = (int) 3; + jresult = result; return jresult; } @@ -2925,6 +3090,7 @@ int result; result = (int) 4; + jresult = result; return jresult; } @@ -2935,6 +3101,7 @@ int result; result = (int) 5; + jresult = result; return jresult; } @@ -2945,6 +3112,7 @@ int result; result = (int) 6; + jresult = result; return jresult; } @@ -2955,6 +3123,7 @@ int result; result = (int) 7; + jresult = result; return jresult; } @@ -2965,6 +3134,7 @@ int result; result = (int) 8; + jresult = result; return jresult; } @@ -2975,6 +3145,7 @@ int result; result = (int) 9; + jresult = result; return jresult; } @@ -2985,6 +3156,7 @@ int result; result = (int) 10; + jresult = result; return jresult; } @@ -2995,6 +3167,7 @@ int result; result = (int) 11; + jresult = result; return jresult; } @@ -3005,6 +3178,7 @@ int result; result = (int) 12; + jresult = result; return jresult; } @@ -3015,6 +3189,7 @@ int result; result = (int) 13; + jresult = result; return jresult; } @@ -3025,6 +3200,7 @@ int result; result = (int) 14; + jresult = result; return jresult; } @@ -3035,6 +3211,7 @@ int result; result = (int) 15; + jresult = result; return jresult; } @@ -3045,6 +3222,7 @@ int result; result = (int) 16; + jresult = result; return jresult; } @@ -3055,6 +3233,7 @@ int result; result = (int) 17; + jresult = result; return jresult; } @@ -3065,6 +3244,7 @@ int result; result = (int) 18; + jresult = result; return jresult; } @@ -3075,6 +3255,7 @@ int result; result = (int) 19; + jresult = result; return jresult; } @@ -3085,6 +3266,7 @@ int result; result = (int) 20; + jresult = result; return jresult; } @@ -3095,6 +3277,7 @@ int result; result = (int) 21; + jresult = result; return jresult; } @@ -3105,6 +3288,7 @@ int result; result = (int) 22; + jresult = result; return jresult; } @@ -3115,6 +3299,7 @@ int result; result = (int) 23; + jresult = result; return jresult; } @@ -3125,6 +3310,7 @@ int result; result = (int) 24; + jresult = result; return jresult; } @@ -3135,6 +3321,7 @@ int result; result = (int) 25; + jresult = result; return jresult; } @@ -3145,6 +3332,7 @@ int result; result = (int) 26; + jresult = result; return jresult; } @@ -3155,6 +3343,7 @@ int result; result = (int) 100; + jresult = result; return jresult; } @@ -3165,6 +3354,7 @@ int result; result = (int) 101; + jresult = result; return jresult; } @@ -3298,6 +3488,7 @@ int result; result = (int) 128; + jresult = result; return jresult; } @@ -3308,6 +3499,7 @@ int result; result = (int) 128; + jresult = result; return jresult; } @@ -3320,6 +3512,7 @@ arg1 = (switch_core_time_duration *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->mms = arg2; + } @@ -3342,6 +3535,7 @@ arg1 = (switch_core_time_duration *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->ms = arg2; + } @@ -3364,6 +3558,7 @@ arg1 = (switch_core_time_duration *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->sec = arg2; + } @@ -3386,6 +3581,7 @@ arg1 = (switch_core_time_duration *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->min = arg2; + } @@ -3408,6 +3604,7 @@ arg1 = (switch_core_time_duration *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->hr = arg2; + } @@ -3430,6 +3627,7 @@ arg1 = (switch_core_time_duration *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->day = arg2; + } @@ -3452,6 +3650,7 @@ arg1 = (switch_core_time_duration *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->yr = arg2; + } @@ -3482,6 +3681,7 @@ arg1 = (switch_core_time_duration *)jarg1; delete arg1; + } @@ -3552,6 +3752,7 @@ arg1 = (switch_app_log *)jarg1; arg2 = (switch_app_log *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -3582,6 +3783,7 @@ arg1 = (switch_app_log *)jarg1; delete arg1; + } @@ -3622,6 +3824,7 @@ arg1 = (switch_core_session_message *)jarg1; arg2 = (switch_core_session_message_types_t)jarg2; if (arg1) (arg1)->message_id = arg2; + } @@ -3644,6 +3847,7 @@ arg1 = (switch_core_session_message *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->numeric_arg = arg2; + } @@ -3701,6 +3905,7 @@ } arg2 = *argp2; if (arg1) (arg1)->string_arg_size = arg2; + } @@ -3711,7 +3916,7 @@ arg1 = (switch_core_session_message *)jarg1; result = ((arg1)->string_arg_size); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -3723,6 +3928,7 @@ arg1 = (switch_core_session_message *)jarg1; arg2 = (void *)jarg2; if (arg1) (arg1)->pointer_arg = arg2; + } @@ -3751,6 +3957,7 @@ } arg2 = *argp2; if (arg1) (arg1)->pointer_arg_size = arg2; + } @@ -3761,7 +3968,7 @@ arg1 = (switch_core_session_message *)jarg1; result = ((arg1)->pointer_arg_size); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -3773,6 +3980,7 @@ arg1 = (switch_core_session_message *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->numeric_reply = arg2; + } @@ -3831,6 +4039,7 @@ } arg2 = *argp2; if (arg1) (arg1)->string_reply_size = arg2; + } @@ -3841,7 +4050,7 @@ arg1 = (switch_core_session_message *)jarg1; result = ((arg1)->string_reply_size); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -3853,6 +4062,7 @@ arg1 = (switch_core_session_message *)jarg1; arg2 = (void *)jarg2; if (arg1) (arg1)->pointer_reply = arg2; + } @@ -3881,6 +4091,7 @@ } arg2 = *argp2; if (arg1) (arg1)->pointer_reply_size = arg2; + } @@ -3891,7 +4102,7 @@ arg1 = (switch_core_session_message *)jarg1; result = ((arg1)->pointer_reply_size); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -3903,6 +4114,7 @@ arg1 = (switch_core_session_message *)jarg1; arg2 = (switch_core_session_message_flag_t)jarg2; if (arg1) (arg1)->flags = arg2; + } @@ -3933,6 +4145,7 @@ arg1 = (switch_core_session_message *)jarg1; delete arg1; + } @@ -3943,6 +4156,7 @@ arg1 = (switch_core_thread_session *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->running = arg2; + } @@ -3965,6 +4179,7 @@ arg1 = (switch_core_thread_session *)jarg1; arg2 = (switch_mutex_t *)jarg2; if (arg1) (arg1)->mutex = arg2; + } @@ -4013,6 +4228,7 @@ arg1 = (switch_core_thread_session *)jarg1; arg2 = (switch_input_callback_function_t)jarg2; if (arg1) (arg1)->input_callback = arg2; + } @@ -4035,6 +4251,7 @@ arg1 = (switch_core_thread_session *)jarg1; arg2 = (switch_memory_pool_t *)jarg2; if (arg1) (arg1)->pool = arg2; + } @@ -4065,6 +4282,7 @@ arg1 = (switch_core_thread_session *)jarg1; delete arg1; + } @@ -4076,8 +4294,8 @@ time_t arg4 ; switch_media_bug_flag_t arg5 ; switch_media_bug_t **arg6 = (switch_media_bug_t **) 0 ; - time_t *argp4 ; switch_status_t result; + time_t *argp4 ; arg1 = (switch_core_session_t *)jarg1; arg2 = (switch_media_bug_callback_t)jarg2; @@ -4414,6 +4632,14 @@ } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_remove_state_handler(void * jarg1) { + switch_state_handler_table_t *arg1 = (switch_state_handler_table_t *) 0 ; + + arg1 = (switch_state_handler_table_t *)jarg1; + switch_core_remove_state_handler((switch_state_handler_table const *)arg1); +} + + SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_get_state_handler(int jarg1) { void * jresult ; int arg1 ; @@ -4498,8 +4724,8 @@ char *arg2 = (char *) 0 ; char *arg3 = (char *) 0 ; int arg4 ; - switch_size_t *argp1 ; void *result = 0 ; + switch_size_t *argp1 ; argp1 = (switch_size_t *)jarg1; if (!argp1) { @@ -4523,8 +4749,8 @@ char *arg3 = (char *) 0 ; char *arg4 = (char *) 0 ; int arg5 ; - switch_size_t *argp2 ; void *result = 0 ; + switch_size_t *argp2 ; arg1 = (switch_memory_pool_t *)jarg1; argp2 = (switch_size_t *)jarg2; @@ -4549,8 +4775,8 @@ char *arg3 = (char *) 0 ; char *arg4 = (char *) 0 ; int arg5 ; - switch_size_t *argp2 ; void *result = 0 ; + switch_size_t *argp2 ; arg1 = (switch_core_session_t *)jarg1; argp2 = (switch_size_t *)jarg2; @@ -4711,7 +4937,7 @@ switch_size_t result; result = switch_core_session_id(); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -5682,7 +5908,7 @@ arg7 = (uint32_t)jarg7; arg8 = (switch_codec_settings_t *)jarg8; arg9 = (switch_memory_pool_t *)jarg9; - result = (switch_status_t)switch_core_codec_init(arg1,arg2,arg3,arg4,arg5,arg6,arg7,(switch_codec_settings const *)arg8,arg9); + result = (switch_status_t)switch_core_codec_init(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5,arg6,arg7,(switch_codec_settings const *)arg8,arg9); jresult = result; return jresult; } @@ -5955,6 +6181,7 @@ char *result = 0 ; result = (char *) "core"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -6456,8 +6683,8 @@ switch_management_action_t arg2 ; char *arg3 = (char *) 0 ; switch_size_t arg4 ; - switch_size_t *argp4 ; switch_status_t result; + switch_size_t *argp4 ; arg1 = (char *)jarg1; arg2 = (switch_management_action_t)jarg2; @@ -6539,7 +6766,7 @@ switch_time_t result; result = switch_core_uptime(); - jresult = new switch_time_t((const switch_time_t &)result); + jresult = new switch_time_t((switch_time_t &)result); return jresult; } @@ -6682,7 +6909,7 @@ switch_time_t result; result = switch_timestamp_now(); - jresult = new switch_time_t((const switch_time_t &)result); + jresult = new switch_time_t((switch_time_t &)result); return jresult; } @@ -6724,7 +6951,7 @@ arg1 = (time_t *)jarg1; result = switch_timestamp(arg1); - jresult = new time_t((const time_t &)result); + jresult = new time_t((time_t &)result); return jresult; } @@ -6814,6 +7041,7 @@ int result; result = (int) 1024; + jresult = result; return jresult; } @@ -6829,8 +7057,8 @@ switch_stream_handle_t *arg1 = (switch_stream_handle_t *) 0 ; uint8_t *arg2 = (uint8_t *) 0 ; switch_size_t arg3 ; - switch_size_t *argp3 ; switch_status_t result; + switch_size_t *argp3 ; arg1 = (switch_stream_handle_t *)jarg1; arg2 = (uint8_t *)jarg2; @@ -6851,6 +7079,7 @@ int result; result = (int) 32767; + jresult = result; return jresult; } @@ -6861,6 +7090,7 @@ int result; result = (int) -32768; + jresult = result; return jresult; } @@ -6884,9 +7114,9 @@ switch_size_t arg2 ; unsigned char *arg3 = (unsigned char *) 0 ; switch_size_t arg4 ; + switch_status_t result; switch_size_t *argp2 ; switch_size_t *argp4 ; - switch_status_t result; arg1 = (unsigned char *)jarg1; argp2 = (switch_size_t *)jarg2; @@ -6913,8 +7143,8 @@ char *arg1 = (char *) 0 ; char *arg2 = (char *) 0 ; switch_size_t arg3 ; - switch_size_t *argp3 ; switch_size_t result; + switch_size_t *argp3 ; arg1 = (char *)jarg1; arg2 = (char *)jarg2; @@ -6925,7 +7155,7 @@ } arg3 = *argp3; result = switch_b64_decode(arg1,arg2,arg3); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -6935,8 +7165,8 @@ char *arg1 = (char *) 0 ; char *arg2 = (char *) 0 ; switch_size_t arg3 ; - switch_size_t *argp3 ; char *result = 0 ; + switch_size_t *argp3 ; arg1 = (char *)jarg1; arg2 = (char *)jarg2; @@ -6969,8 +7199,8 @@ int arg1 ; char *arg2 = (char *) 0 ; switch_size_t arg3 ; - switch_size_t *argp3 ; switch_size_t result; + switch_size_t *argp3 ; arg1 = (int)jarg1; arg2 = (char *)jarg2; @@ -6981,7 +7211,7 @@ } arg3 = *argp3; result = switch_fd_read_line(arg1,arg2,arg3); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -7008,9 +7238,9 @@ switch_size_t arg2 ; sockaddr *arg3 = (sockaddr *) 0 ; socklen_t arg4 ; + char *result = 0 ; switch_size_t *argp2 ; socklen_t *argp4 ; - char *result = 0 ; arg1 = (char *)jarg1; argp2 = (switch_size_t *)jarg2; @@ -7052,8 +7282,8 @@ char *arg4 = (char *) 0 ; switch_sockaddr_t *arg5 = (switch_sockaddr_t *) 0 ; int arg6 ; - switch_size_t *argp2 ; int result; + switch_size_t *argp2 ; arg1 = (char *)jarg1; argp2 = (switch_size_t *)jarg2; @@ -7120,6 +7350,18 @@ } +SWIGEXPORT char * SWIGSTDCALL CSharp_switch_safe_strdup(char * jarg1) { + char * jresult ; + char *arg1 = (char *) 0 ; + char *result = 0 ; + + arg1 = (char *)jarg1; + result = (char *)switch_safe_strdup((char const *)arg1); + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + SWIGEXPORT int SWIGSTDCALL CSharp_switch_strstr(char * jarg1, char * jarg2) { int jresult ; char *arg1 = (char *) 0 ; @@ -7141,7 +7383,7 @@ arg1 = (char *)jarg1; result = switch_str_time((char const *)arg1); - jresult = new switch_time_t((const switch_time_t &)result); + jresult = new switch_time_t((switch_time_t &)result); return jresult; } @@ -7611,6 +7853,7 @@ arg1 = (switch_caller_profile *)jarg1; arg2 = (uint8_t)jarg2; if (arg1) (arg1)->caller_ton = arg2; + } @@ -7633,6 +7876,7 @@ arg1 = (switch_caller_profile *)jarg1; arg2 = (uint8_t)jarg2; if (arg1) (arg1)->caller_numplan = arg2; + } @@ -7713,6 +7957,7 @@ arg1 = (switch_caller_profile *)jarg1; arg2 = (uint8_t)jarg2; if (arg1) (arg1)->ani_ton = arg2; + } @@ -7735,6 +7980,7 @@ arg1 = (switch_caller_profile *)jarg1; arg2 = (uint8_t)jarg2; if (arg1) (arg1)->ani_numplan = arg2; + } @@ -7815,6 +8061,7 @@ arg1 = (switch_caller_profile *)jarg1; arg2 = (uint8_t)jarg2; if (arg1) (arg1)->rdnis_ton = arg2; + } @@ -7837,6 +8084,7 @@ arg1 = (switch_caller_profile *)jarg1; arg2 = (uint8_t)jarg2; if (arg1) (arg1)->rdnis_numplan = arg2; + } @@ -7889,6 +8137,7 @@ arg1 = (switch_caller_profile *)jarg1; arg2 = (uint8_t)jarg2; if (arg1) (arg1)->destination_number_ton = arg2; + } @@ -7911,6 +8160,7 @@ arg1 = (switch_caller_profile *)jarg1; arg2 = (uint8_t)jarg2; if (arg1) (arg1)->destination_number_numplan = arg2; + } @@ -8080,6 +8330,7 @@ arg1 = (switch_caller_profile *)jarg1; arg2 = (switch_caller_profile_flag_t)jarg2; if (arg1) (arg1)->flags = arg2; + } @@ -8102,6 +8353,7 @@ arg1 = (switch_caller_profile *)jarg1; arg2 = (switch_caller_profile *)jarg2; if (arg1) (arg1)->originator_caller_profile = arg2; + } @@ -8124,6 +8376,7 @@ arg1 = (switch_caller_profile *)jarg1; arg2 = (switch_caller_profile *)jarg2; if (arg1) (arg1)->originatee_caller_profile = arg2; + } @@ -8146,6 +8399,7 @@ arg1 = (switch_caller_profile *)jarg1; arg2 = (switch_channel_timetable *)jarg2; if (arg1) (arg1)->times = arg2; + } @@ -8168,6 +8422,7 @@ arg1 = (switch_caller_profile *)jarg1; arg2 = (switch_caller_extension *)jarg2; if (arg1) (arg1)->caller_extension = arg2; + } @@ -8190,6 +8445,7 @@ arg1 = (switch_caller_profile *)jarg1; arg2 = (switch_memory_pool_t *)jarg2; if (arg1) (arg1)->pool = arg2; + } @@ -8212,6 +8468,7 @@ arg1 = (switch_caller_profile *)jarg1; arg2 = (switch_caller_profile *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -8242,6 +8499,7 @@ arg1 = (switch_caller_profile *)jarg1; delete arg1; + } @@ -8312,6 +8570,7 @@ arg1 = (switch_caller_application *)jarg1; arg2 = (switch_application_function_t)jarg2; if (arg1) (arg1)->application_function = arg2; + } @@ -8334,6 +8593,7 @@ arg1 = (switch_caller_application *)jarg1; arg2 = (switch_caller_application *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -8364,6 +8624,7 @@ arg1 = (switch_caller_application *)jarg1; delete arg1; + } @@ -8434,6 +8695,7 @@ arg1 = (switch_caller_extension *)jarg1; arg2 = (switch_caller_application_t *)jarg2; if (arg1) (arg1)->current_application = arg2; + } @@ -8456,6 +8718,7 @@ arg1 = (switch_caller_extension *)jarg1; arg2 = (switch_caller_application_t *)jarg2; if (arg1) (arg1)->last_application = arg2; + } @@ -8478,6 +8741,7 @@ arg1 = (switch_caller_extension *)jarg1; arg2 = (switch_caller_application_t *)jarg2; if (arg1) (arg1)->applications = arg2; + } @@ -8500,6 +8764,7 @@ arg1 = (switch_caller_extension *)jarg1; arg2 = (switch_caller_profile *)jarg2; if (arg1) (arg1)->children = arg2; + } @@ -8522,6 +8787,7 @@ arg1 = (switch_caller_extension *)jarg1; arg2 = (switch_caller_extension *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -8552,6 +8818,7 @@ arg1 = (switch_caller_extension *)jarg1; delete arg1; + } @@ -8696,6 +8963,7 @@ arg1 = (switch_frame *)jarg1; arg2 = (switch_codec_t *)jarg2; if (arg1) (arg1)->codec = arg2; + } @@ -8747,6 +9015,7 @@ arg1 = (switch_frame *)jarg1; arg2 = (void *)jarg2; if (arg1) (arg1)->packet = arg2; + } @@ -8769,6 +9038,7 @@ arg1 = (switch_frame *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->packetlen = arg2; + } @@ -8791,6 +9061,7 @@ arg1 = (switch_frame *)jarg1; arg2 = (void *)jarg2; if (arg1) (arg1)->data = arg2; + } @@ -8813,6 +9084,7 @@ arg1 = (switch_frame *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->datalen = arg2; + } @@ -8835,6 +9107,7 @@ arg1 = (switch_frame *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->buflen = arg2; + } @@ -8857,6 +9130,7 @@ arg1 = (switch_frame *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->samples = arg2; + } @@ -8879,6 +9153,7 @@ arg1 = (switch_frame *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->rate = arg2; + } @@ -8901,6 +9176,7 @@ arg1 = (switch_frame *)jarg1; arg2 = (switch_payload_t)jarg2; if (arg1) (arg1)->payload = arg2; + } @@ -8929,6 +9205,7 @@ } arg2 = *argp2; if (arg1) (arg1)->timestamp = arg2; + } @@ -8939,7 +9216,7 @@ arg1 = (switch_frame *)jarg1; result = ((arg1)->timestamp); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -8951,6 +9228,7 @@ arg1 = (switch_frame *)jarg1; arg2 = (uint16_t)jarg2; if (arg1) (arg1)->seq = arg2; + } @@ -8973,6 +9251,7 @@ arg1 = (switch_frame *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->ssrc = arg2; + } @@ -8995,6 +9274,7 @@ arg1 = (switch_frame *)jarg1; arg2 = (switch_bool_t)jarg2; if (arg1) (arg1)->m = arg2; + } @@ -9017,6 +9297,7 @@ arg1 = (switch_frame *)jarg1; arg2 = (switch_frame_flag_t)jarg2; if (arg1) (arg1)->flags = arg2; + } @@ -9047,6 +9328,7 @@ arg1 = (switch_frame *)jarg1; delete arg1; + } @@ -9057,6 +9339,7 @@ arg1 = (switch_state_handler_table *)jarg1; arg2 = (switch_state_handler_t)jarg2; if (arg1) (arg1)->on_init = arg2; + } @@ -9079,6 +9362,7 @@ arg1 = (switch_state_handler_table *)jarg1; arg2 = (switch_state_handler_t)jarg2; if (arg1) (arg1)->on_routing = arg2; + } @@ -9101,6 +9385,7 @@ arg1 = (switch_state_handler_table *)jarg1; arg2 = (switch_state_handler_t)jarg2; if (arg1) (arg1)->on_execute = arg2; + } @@ -9123,6 +9408,7 @@ arg1 = (switch_state_handler_table *)jarg1; arg2 = (switch_state_handler_t)jarg2; if (arg1) (arg1)->on_hangup = arg2; + } @@ -9145,6 +9431,7 @@ arg1 = (switch_state_handler_table *)jarg1; arg2 = (switch_state_handler_t)jarg2; if (arg1) (arg1)->on_exchange_media = arg2; + } @@ -9167,6 +9454,7 @@ arg1 = (switch_state_handler_table *)jarg1; arg2 = (switch_state_handler_t)jarg2; if (arg1) (arg1)->on_soft_execute = arg2; + } @@ -9189,6 +9477,7 @@ arg1 = (switch_state_handler_table *)jarg1; arg2 = (switch_state_handler_t)jarg2; if (arg1) (arg1)->on_consume_media = arg2; + } @@ -9211,6 +9500,7 @@ arg1 = (switch_state_handler_table *)jarg1; arg2 = (switch_state_handler_t)jarg2; if (arg1) (arg1)->on_hibernate = arg2; + } @@ -9233,6 +9523,7 @@ arg1 = (switch_state_handler_table *)jarg1; arg2 = (switch_state_handler_t)jarg2; if (arg1) (arg1)->on_reset = arg2; + } @@ -9255,6 +9546,7 @@ arg1 = (switch_state_handler_table *)jarg1; arg2 = (switch_state_handler_t)jarg2; if (arg1) (arg1)->on_park = arg2; + } @@ -9311,6 +9603,7 @@ arg1 = (switch_state_handler_table *)jarg1; delete arg1; + } @@ -9321,6 +9614,7 @@ arg1 = (switch_stream_handle *)jarg1; arg2 = (switch_stream_handle_write_function_t)jarg2; if (arg1) (arg1)->write_function = arg2; + } @@ -9343,6 +9637,7 @@ arg1 = (switch_stream_handle *)jarg1; arg2 = (switch_stream_handle_raw_write_function_t)jarg2; if (arg1) (arg1)->raw_write_function = arg2; + } @@ -9365,6 +9660,7 @@ arg1 = (switch_stream_handle *)jarg1; arg2 = (void *)jarg2; if (arg1) (arg1)->data = arg2; + } @@ -9387,6 +9683,7 @@ arg1 = (switch_stream_handle *)jarg1; arg2 = (void *)jarg2; if (arg1) (arg1)->end = arg2; + } @@ -9415,6 +9712,7 @@ } arg2 = *argp2; if (arg1) (arg1)->data_size = arg2; + } @@ -9425,7 +9723,7 @@ arg1 = (switch_stream_handle *)jarg1; result = ((arg1)->data_size); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -9443,6 +9741,7 @@ } arg2 = *argp2; if (arg1) (arg1)->data_len = arg2; + } @@ -9453,7 +9752,7 @@ arg1 = (switch_stream_handle *)jarg1; result = ((arg1)->data_len); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -9471,6 +9770,7 @@ } arg2 = *argp2; if (arg1) (arg1)->alloc_len = arg2; + } @@ -9481,7 +9781,7 @@ arg1 = (switch_stream_handle *)jarg1; result = ((arg1)->alloc_len); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -9499,6 +9799,7 @@ } arg2 = *argp2; if (arg1) (arg1)->alloc_chunk = arg2; + } @@ -9509,7 +9810,7 @@ arg1 = (switch_stream_handle *)jarg1; result = ((arg1)->alloc_chunk); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -9521,6 +9822,7 @@ arg1 = (switch_stream_handle *)jarg1; arg2 = (switch_event_t *)jarg2; if (arg1) (arg1)->param_event = arg2; + } @@ -9551,6 +9853,7 @@ arg1 = (switch_stream_handle *)jarg1; delete arg1; + } @@ -9561,6 +9864,7 @@ arg1 = (switch_io_routines *)jarg1; arg2 = (switch_io_outgoing_channel_t)jarg2; if (arg1) (arg1)->outgoing_channel = arg2; + } @@ -9583,6 +9887,7 @@ arg1 = (switch_io_routines *)jarg1; arg2 = (switch_io_read_frame_t)jarg2; if (arg1) (arg1)->read_frame = arg2; + } @@ -9605,6 +9910,7 @@ arg1 = (switch_io_routines *)jarg1; arg2 = (switch_io_write_frame_t)jarg2; if (arg1) (arg1)->write_frame = arg2; + } @@ -9627,6 +9933,7 @@ arg1 = (switch_io_routines *)jarg1; arg2 = (switch_io_kill_channel_t)jarg2; if (arg1) (arg1)->kill_channel = arg2; + } @@ -9649,6 +9956,7 @@ arg1 = (switch_io_routines *)jarg1; arg2 = (switch_io_send_dtmf_t)jarg2; if (arg1) (arg1)->send_dtmf = arg2; + } @@ -9671,6 +9979,7 @@ arg1 = (switch_io_routines *)jarg1; arg2 = (switch_io_receive_message_t)jarg2; if (arg1) (arg1)->receive_message = arg2; + } @@ -9693,6 +10002,7 @@ arg1 = (switch_io_routines *)jarg1; arg2 = (switch_io_receive_event_t)jarg2; if (arg1) (arg1)->receive_event = arg2; + } @@ -9715,6 +10025,7 @@ arg1 = (switch_io_routines *)jarg1; arg2 = (switch_io_state_change_t)jarg2; if (arg1) (arg1)->state_change = arg2; + } @@ -9737,6 +10048,7 @@ arg1 = (switch_io_routines *)jarg1; arg2 = (switch_io_read_video_frame_t)jarg2; if (arg1) (arg1)->read_video_frame = arg2; + } @@ -9759,6 +10071,7 @@ arg1 = (switch_io_routines *)jarg1; arg2 = (switch_io_write_video_frame_t)jarg2; if (arg1) (arg1)->write_video_frame = arg2; + } @@ -9781,6 +10094,7 @@ arg1 = (switch_io_routines *)jarg1; arg2 = (switch_io_resurrect_session_t)jarg2; if (arg1) (arg1)->resurrect_session = arg2; + } @@ -9837,6 +10151,7 @@ arg1 = (switch_io_routines *)jarg1; delete arg1; + } @@ -9876,6 +10191,7 @@ arg1 = (switch_endpoint_interface *)jarg1; arg2 = (switch_io_routines_t *)jarg2; if (arg1) (arg1)->io_routines = arg2; + } @@ -9898,6 +10214,7 @@ arg1 = (switch_endpoint_interface *)jarg1; arg2 = (switch_state_handler_table_t *)jarg2; if (arg1) (arg1)->state_handler = arg2; + } @@ -9920,6 +10237,7 @@ arg1 = (switch_endpoint_interface *)jarg1; arg2 = (void *)jarg2; if (arg1) (arg1)->private_info = arg2; + } @@ -9942,6 +10260,7 @@ arg1 = (switch_endpoint_interface *)jarg1; arg2 = (switch_thread_rwlock_t *)jarg2; if (arg1) (arg1)->rwlock = arg2; + } @@ -9964,6 +10283,7 @@ arg1 = (switch_endpoint_interface *)jarg1; arg2 = (switch_endpoint_interface *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -9994,6 +10314,7 @@ arg1 = (switch_endpoint_interface *)jarg1; delete arg1; + } @@ -10004,6 +10325,7 @@ arg1 = (switch_timer *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->interval = arg2; + } @@ -10026,6 +10348,7 @@ arg1 = (switch_timer *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->flags = arg2; + } @@ -10048,6 +10371,7 @@ arg1 = (switch_timer *)jarg1; arg2 = (unsigned int)jarg2; if (arg1) (arg1)->samples = arg2; + } @@ -10070,6 +10394,7 @@ arg1 = (switch_timer *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->samplecount = arg2; + } @@ -10092,6 +10417,7 @@ arg1 = (switch_timer *)jarg1; arg2 = (switch_timer_interface_t *)jarg2; if (arg1) (arg1)->timer_interface = arg2; + } @@ -10114,6 +10440,7 @@ arg1 = (switch_timer *)jarg1; arg2 = (switch_memory_pool_t *)jarg2; if (arg1) (arg1)->memory_pool = arg2; + } @@ -10136,6 +10463,7 @@ arg1 = (switch_timer *)jarg1; arg2 = (void *)jarg2; if (arg1) (arg1)->private_info = arg2; + } @@ -10164,6 +10492,7 @@ } arg2 = *argp2; if (arg1) (arg1)->diff = arg2; + } @@ -10174,7 +10503,7 @@ arg1 = (switch_timer *)jarg1; result = ((arg1)->diff); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -10192,6 +10521,7 @@ } arg2 = *argp2; if (arg1) (arg1)->tick = arg2; + } @@ -10202,7 +10532,7 @@ arg1 = (switch_timer *)jarg1; result = ((arg1)->tick); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -10222,6 +10552,7 @@ arg1 = (switch_timer *)jarg1; delete arg1; + } @@ -10261,6 +10592,7 @@ arg1 = (switch_timer_interface *)jarg1; arg2 = (switch_status_t (*)(switch_timer_t *))jarg2; if (arg1) (arg1)->timer_init = arg2; + } @@ -10283,6 +10615,7 @@ arg1 = (switch_timer_interface *)jarg1; arg2 = (switch_status_t (*)(switch_timer_t *))jarg2; if (arg1) (arg1)->timer_next = arg2; + } @@ -10305,6 +10638,7 @@ arg1 = (switch_timer_interface *)jarg1; arg2 = (switch_status_t (*)(switch_timer_t *))jarg2; if (arg1) (arg1)->timer_step = arg2; + } @@ -10327,6 +10661,7 @@ arg1 = (switch_timer_interface *)jarg1; arg2 = (switch_status_t (*)(switch_timer_t *))jarg2; if (arg1) (arg1)->timer_sync = arg2; + } @@ -10349,6 +10684,7 @@ arg1 = (switch_timer_interface *)jarg1; arg2 = (switch_status_t (*)(switch_timer_t *,switch_bool_t))jarg2; if (arg1) (arg1)->timer_check = arg2; + } @@ -10371,6 +10707,7 @@ arg1 = (switch_timer_interface *)jarg1; arg2 = (switch_status_t (*)(switch_timer_t *))jarg2; if (arg1) (arg1)->timer_destroy = arg2; + } @@ -10393,6 +10730,7 @@ arg1 = (switch_timer_interface *)jarg1; arg2 = (switch_thread_rwlock_t *)jarg2; if (arg1) (arg1)->rwlock = arg2; + } @@ -10415,6 +10753,7 @@ arg1 = (switch_timer_interface *)jarg1; arg2 = (switch_timer_interface *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -10445,6 +10784,7 @@ arg1 = (switch_timer_interface *)jarg1; delete arg1; + } @@ -10484,6 +10824,7 @@ arg1 = (switch_dialplan_interface *)jarg1; arg2 = (switch_dialplan_hunt_function_t)jarg2; if (arg1) (arg1)->hunt_function = arg2; + } @@ -10506,6 +10847,7 @@ arg1 = (switch_dialplan_interface *)jarg1; arg2 = (switch_thread_rwlock_t *)jarg2; if (arg1) (arg1)->rwlock = arg2; + } @@ -10528,6 +10870,7 @@ arg1 = (switch_dialplan_interface *)jarg1; arg2 = (switch_dialplan_interface *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -10558,6 +10901,7 @@ arg1 = (switch_dialplan_interface *)jarg1; delete arg1; + } @@ -10597,6 +10941,7 @@ arg1 = (switch_file_interface *)jarg1; arg2 = (switch_status_t (*)(switch_file_handle_t *,char const *))jarg2; if (arg1) (arg1)->file_open = arg2; + } @@ -10619,6 +10964,7 @@ arg1 = (switch_file_interface *)jarg1; arg2 = (switch_status_t (*)(switch_file_handle_t *))jarg2; if (arg1) (arg1)->file_close = arg2; + } @@ -10641,6 +10987,7 @@ arg1 = (switch_file_interface *)jarg1; arg2 = (switch_status_t (*)(switch_file_handle_t *,void *,switch_size_t *))jarg2; if (arg1) (arg1)->file_read = arg2; + } @@ -10663,6 +11010,7 @@ arg1 = (switch_file_interface *)jarg1; arg2 = (switch_status_t (*)(switch_file_handle_t *,void *,switch_size_t *))jarg2; if (arg1) (arg1)->file_write = arg2; + } @@ -10685,6 +11033,7 @@ arg1 = (switch_file_interface *)jarg1; arg2 = (switch_status_t (*)(switch_file_handle_t *,unsigned int *,int64_t,int))jarg2; if (arg1) (arg1)->file_seek = arg2; + } @@ -10707,6 +11056,7 @@ arg1 = (switch_file_interface *)jarg1; arg2 = (switch_status_t (*)(switch_file_handle_t *,switch_audio_col_t,char const *))jarg2; if (arg1) (arg1)->file_set_string = arg2; + } @@ -10729,6 +11079,7 @@ arg1 = (switch_file_interface *)jarg1; arg2 = (switch_status_t (*)(switch_file_handle_t *,switch_audio_col_t,char const **))jarg2; if (arg1) (arg1)->file_get_string = arg2; + } @@ -10751,6 +11102,7 @@ arg1 = (switch_file_interface *)jarg1; arg2 = (char **)jarg2; if (arg1) (arg1)->extens = arg2; + } @@ -10773,6 +11125,7 @@ arg1 = (switch_file_interface *)jarg1; arg2 = (switch_thread_rwlock_t *)jarg2; if (arg1) (arg1)->rwlock = arg2; + } @@ -10795,6 +11148,7 @@ arg1 = (switch_file_interface *)jarg1; arg2 = (switch_file_interface *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -10825,6 +11179,7 @@ arg1 = (switch_file_interface *)jarg1; delete arg1; + } @@ -10835,6 +11190,7 @@ arg1 = (switch_file_handle *)jarg1; arg2 = (switch_file_interface_t *)jarg2; if (arg1) (arg1)->file_interface = (switch_file_interface_t const *)arg2; + } @@ -10857,6 +11213,7 @@ arg1 = (switch_file_handle *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->flags = arg2; + } @@ -10879,6 +11236,7 @@ arg1 = (switch_file_handle *)jarg1; arg2 = (switch_file_t *)jarg2; if (arg1) (arg1)->fd = arg2; + } @@ -10901,6 +11259,7 @@ arg1 = (switch_file_handle *)jarg1; arg2 = (unsigned int)jarg2; if (arg1) (arg1)->samples = arg2; + } @@ -10923,6 +11282,7 @@ arg1 = (switch_file_handle *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->samplerate = arg2; + } @@ -10945,6 +11305,7 @@ arg1 = (switch_file_handle *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->native_rate = arg2; + } @@ -10967,6 +11328,7 @@ arg1 = (switch_file_handle *)jarg1; arg2 = (uint8_t)jarg2; if (arg1) (arg1)->channels = arg2; + } @@ -10989,6 +11351,7 @@ arg1 = (switch_file_handle *)jarg1; arg2 = (unsigned int)jarg2; if (arg1) (arg1)->format = arg2; + } @@ -11011,6 +11374,7 @@ arg1 = (switch_file_handle *)jarg1; arg2 = (unsigned int)jarg2; if (arg1) (arg1)->sections = arg2; + } @@ -11033,6 +11397,7 @@ arg1 = (switch_file_handle *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->seekable = arg2; + } @@ -11061,6 +11426,7 @@ } arg2 = *argp2; if (arg1) (arg1)->sample_count = arg2; + } @@ -11071,7 +11437,7 @@ arg1 = (switch_file_handle *)jarg1; result = ((arg1)->sample_count); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -11083,6 +11449,7 @@ arg1 = (switch_file_handle *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->speed = arg2; + } @@ -11105,6 +11472,7 @@ arg1 = (switch_file_handle *)jarg1; arg2 = (switch_memory_pool_t *)jarg2; if (arg1) (arg1)->memory_pool = arg2; + } @@ -11127,6 +11495,7 @@ arg1 = (switch_file_handle *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->prebuf = arg2; + } @@ -11149,6 +11518,7 @@ arg1 = (switch_file_handle *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->interval = arg2; + } @@ -11171,6 +11541,7 @@ arg1 = (switch_file_handle *)jarg1; arg2 = (void *)jarg2; if (arg1) (arg1)->private_info = arg2; + } @@ -11223,6 +11594,7 @@ arg1 = (switch_file_handle *)jarg1; arg2 = (int64_t)jarg2; if (arg1) (arg1)->pos = arg2; + } @@ -11245,6 +11617,7 @@ arg1 = (switch_file_handle *)jarg1; arg2 = (switch_buffer_t *)jarg2; if (arg1) (arg1)->audio_buffer = arg2; + } @@ -11267,6 +11640,7 @@ arg1 = (switch_file_handle *)jarg1; arg2 = (switch_buffer_t *)jarg2; if (arg1) (arg1)->sp_audio_buffer = arg2; + } @@ -11289,6 +11663,7 @@ arg1 = (switch_file_handle *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->thresh = arg2; + } @@ -11311,6 +11686,7 @@ arg1 = (switch_file_handle *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->silence_hits = arg2; + } @@ -11333,6 +11709,7 @@ arg1 = (switch_file_handle *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->offset_pos = arg2; + } @@ -11355,6 +11732,7 @@ arg1 = (switch_file_handle *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->last_pos = arg2; + } @@ -11377,6 +11755,7 @@ arg1 = (switch_file_handle *)jarg1; arg2 = (int32_t)jarg2; if (arg1) (arg1)->vol = arg2; + } @@ -11399,6 +11778,7 @@ arg1 = (switch_file_handle *)jarg1; arg2 = (switch_audio_resampler_t *)jarg2; if (arg1) (arg1)->resampler = arg2; + } @@ -11421,6 +11801,7 @@ arg1 = (switch_file_handle *)jarg1; arg2 = (switch_buffer_t *)jarg2; if (arg1) (arg1)->buffer = arg2; + } @@ -11443,6 +11824,7 @@ arg1 = (switch_file_handle *)jarg1; arg2 = (switch_byte_t *)jarg2; if (arg1) (arg1)->dbuf = arg2; + } @@ -11471,6 +11853,7 @@ } arg2 = *argp2; if (arg1) (arg1)->dbuflen = arg2; + } @@ -11481,7 +11864,7 @@ arg1 = (switch_file_handle *)jarg1; result = ((arg1)->dbuflen); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -11551,6 +11934,7 @@ arg1 = (switch_file_handle *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->line = arg2; + } @@ -11581,6 +11965,7 @@ arg1 = (switch_file_handle *)jarg1; delete arg1; + } @@ -11620,6 +12005,7 @@ arg1 = (switch_asr_interface *)jarg1; arg2 = (switch_status_t (*)(switch_asr_handle_t *,char const *,int,char const *,switch_asr_flag_t *))jarg2; if (arg1) (arg1)->asr_open = arg2; + } @@ -11642,6 +12028,7 @@ arg1 = (switch_asr_interface *)jarg1; arg2 = (switch_status_t (*)(switch_asr_handle_t *,char const *,char const *))jarg2; if (arg1) (arg1)->asr_load_grammar = arg2; + } @@ -11664,6 +12051,7 @@ arg1 = (switch_asr_interface *)jarg1; arg2 = (switch_status_t (*)(switch_asr_handle_t *,char const *))jarg2; if (arg1) (arg1)->asr_unload_grammar = arg2; + } @@ -11686,6 +12074,7 @@ arg1 = (switch_asr_interface *)jarg1; arg2 = (switch_status_t (*)(switch_asr_handle_t *,switch_asr_flag_t *))jarg2; if (arg1) (arg1)->asr_close = arg2; + } @@ -11708,6 +12097,7 @@ arg1 = (switch_asr_interface *)jarg1; arg2 = (switch_status_t (*)(switch_asr_handle_t *,void *,unsigned int,switch_asr_flag_t *))jarg2; if (arg1) (arg1)->asr_feed = arg2; + } @@ -11730,6 +12120,7 @@ arg1 = (switch_asr_interface *)jarg1; arg2 = (switch_status_t (*)(switch_asr_handle_t *))jarg2; if (arg1) (arg1)->asr_resume = arg2; + } @@ -11752,6 +12143,7 @@ arg1 = (switch_asr_interface *)jarg1; arg2 = (switch_status_t (*)(switch_asr_handle_t *))jarg2; if (arg1) (arg1)->asr_pause = arg2; + } @@ -11774,6 +12166,7 @@ arg1 = (switch_asr_interface *)jarg1; arg2 = (switch_status_t (*)(switch_asr_handle_t *,switch_asr_flag_t *))jarg2; if (arg1) (arg1)->asr_check_results = arg2; + } @@ -11796,6 +12189,7 @@ arg1 = (switch_asr_interface *)jarg1; arg2 = (switch_status_t (*)(switch_asr_handle_t *,char **,switch_asr_flag_t *))jarg2; if (arg1) (arg1)->asr_get_results = arg2; + } @@ -11818,6 +12212,7 @@ arg1 = (switch_asr_interface *)jarg1; arg2 = (switch_thread_rwlock_t *)jarg2; if (arg1) (arg1)->rwlock = arg2; + } @@ -11840,6 +12235,7 @@ arg1 = (switch_asr_interface *)jarg1; arg2 = (switch_asr_interface *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -11870,6 +12266,7 @@ arg1 = (switch_asr_interface *)jarg1; delete arg1; + } @@ -11880,6 +12277,7 @@ arg1 = (switch_asr_handle *)jarg1; arg2 = (switch_asr_interface_t *)jarg2; if (arg1) (arg1)->asr_interface = (switch_asr_interface_t const *)arg2; + } @@ -11902,6 +12300,7 @@ arg1 = (switch_asr_handle *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->flags = arg2; + } @@ -11984,6 +12383,7 @@ arg1 = (switch_asr_handle *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->rate = arg2; + } @@ -12066,6 +12466,7 @@ arg1 = (switch_asr_handle *)jarg1; arg2 = (switch_memory_pool_t *)jarg2; if (arg1) (arg1)->memory_pool = arg2; + } @@ -12088,6 +12489,7 @@ arg1 = (switch_asr_handle *)jarg1; arg2 = (void *)jarg2; if (arg1) (arg1)->private_info = arg2; + } @@ -12118,6 +12520,7 @@ arg1 = (switch_asr_handle *)jarg1; delete arg1; + } @@ -12157,6 +12560,7 @@ arg1 = (switch_speech_interface *)jarg1; arg2 = (switch_status_t (*)(switch_speech_handle_t *,char const *,int,switch_speech_flag_t *))jarg2; if (arg1) (arg1)->speech_open = arg2; + } @@ -12179,6 +12583,7 @@ arg1 = (switch_speech_interface *)jarg1; arg2 = (switch_status_t (*)(switch_speech_handle_t *,switch_speech_flag_t *))jarg2; if (arg1) (arg1)->speech_close = arg2; + } @@ -12201,6 +12606,7 @@ arg1 = (switch_speech_interface *)jarg1; arg2 = (switch_status_t (*)(switch_speech_handle_t *,char *,switch_speech_flag_t *))jarg2; if (arg1) (arg1)->speech_feed_tts = arg2; + } @@ -12223,6 +12629,7 @@ arg1 = (switch_speech_interface *)jarg1; arg2 = (switch_status_t (*)(switch_speech_handle_t *,void *,switch_size_t *,uint32_t *,switch_speech_flag_t *))jarg2; if (arg1) (arg1)->speech_read_tts = arg2; + } @@ -12245,6 +12652,7 @@ arg1 = (switch_speech_interface *)jarg1; arg2 = (void (*)(switch_speech_handle_t *))jarg2; if (arg1) (arg1)->speech_flush_tts = arg2; + } @@ -12267,6 +12675,7 @@ arg1 = (switch_speech_interface *)jarg1; arg2 = (void (*)(switch_speech_handle_t *,char *,char const *))jarg2; if (arg1) (arg1)->speech_text_param_tts = arg2; + } @@ -12289,6 +12698,7 @@ arg1 = (switch_speech_interface *)jarg1; arg2 = (void (*)(switch_speech_handle_t *,char *,int))jarg2; if (arg1) (arg1)->speech_numeric_param_tts = arg2; + } @@ -12311,6 +12721,7 @@ arg1 = (switch_speech_interface *)jarg1; arg2 = (void (*)(switch_speech_handle_t *,char *,double))jarg2; if (arg1) (arg1)->speech_float_param_tts = arg2; + } @@ -12333,6 +12744,7 @@ arg1 = (switch_speech_interface *)jarg1; arg2 = (switch_thread_rwlock_t *)jarg2; if (arg1) (arg1)->rwlock = arg2; + } @@ -12355,6 +12767,7 @@ arg1 = (switch_speech_interface *)jarg1; arg2 = (switch_speech_interface *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -12385,6 +12798,7 @@ arg1 = (switch_speech_interface *)jarg1; delete arg1; + } @@ -12395,6 +12809,7 @@ arg1 = (switch_speech_handle *)jarg1; arg2 = (switch_speech_interface_t *)jarg2; if (arg1) (arg1)->speech_interface = (switch_speech_interface_t const *)arg2; + } @@ -12417,6 +12832,7 @@ arg1 = (switch_speech_handle *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->flags = arg2; + } @@ -12469,6 +12885,7 @@ arg1 = (switch_speech_handle *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->rate = arg2; + } @@ -12491,6 +12908,7 @@ arg1 = (switch_speech_handle *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->speed = arg2; + } @@ -12513,6 +12931,7 @@ arg1 = (switch_speech_handle *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->samples = arg2; + } @@ -12620,6 +13039,7 @@ arg1 = (switch_speech_handle *)jarg1; arg2 = (switch_memory_pool_t *)jarg2; if (arg1) (arg1)->memory_pool = arg2; + } @@ -12642,6 +13062,7 @@ arg1 = (switch_speech_handle *)jarg1; arg2 = (void *)jarg2; if (arg1) (arg1)->private_info = arg2; + } @@ -12672,6 +13093,7 @@ arg1 = (switch_speech_handle *)jarg1; delete arg1; + } @@ -12711,6 +13133,7 @@ arg1 = (switch_say_interface *)jarg1; arg2 = (switch_say_callback_t)jarg2; if (arg1) (arg1)->say_function = arg2; + } @@ -12733,6 +13156,7 @@ arg1 = (switch_say_interface *)jarg1; arg2 = (switch_thread_rwlock_t *)jarg2; if (arg1) (arg1)->rwlock = arg2; + } @@ -12755,6 +13179,7 @@ arg1 = (switch_say_interface *)jarg1; arg2 = (switch_say_interface *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -12785,6 +13210,7 @@ arg1 = (switch_say_interface *)jarg1; delete arg1; + } @@ -12824,6 +13250,7 @@ arg1 = (switch_chat_interface *)jarg1; arg2 = (switch_status_t (*)(char *,char *,char *,char *,char *,char *))jarg2; if (arg1) (arg1)->chat_send = arg2; + } @@ -12846,6 +13273,7 @@ arg1 = (switch_chat_interface *)jarg1; arg2 = (switch_thread_rwlock_t *)jarg2; if (arg1) (arg1)->rwlock = arg2; + } @@ -12868,6 +13296,7 @@ arg1 = (switch_chat_interface *)jarg1; arg2 = (switch_chat_interface *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -12898,6 +13327,7 @@ arg1 = (switch_chat_interface *)jarg1; delete arg1; + } @@ -12937,6 +13367,7 @@ arg1 = (switch_management_interface *)jarg1; arg2 = (switch_status_t (*)(char *,switch_management_action_t,char *,switch_size_t))jarg2; if (arg1) (arg1)->management_function = arg2; + } @@ -12959,6 +13390,7 @@ arg1 = (switch_management_interface *)jarg1; arg2 = (switch_thread_rwlock_t *)jarg2; if (arg1) (arg1)->rwlock = arg2; + } @@ -12981,6 +13413,7 @@ arg1 = (switch_management_interface *)jarg1; arg2 = (switch_management_interface *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -13011,6 +13444,7 @@ arg1 = (switch_management_interface *)jarg1; delete arg1; + } @@ -13050,6 +13484,7 @@ arg1 = (switch_directory_interface *)jarg1; arg2 = (switch_status_t (*)(switch_directory_handle_t *,char *,char *,char *))jarg2; if (arg1) (arg1)->directory_open = arg2; + } @@ -13072,6 +13507,7 @@ arg1 = (switch_directory_interface *)jarg1; arg2 = (switch_status_t (*)(switch_directory_handle_t *))jarg2; if (arg1) (arg1)->directory_close = arg2; + } @@ -13094,6 +13530,7 @@ arg1 = (switch_directory_interface *)jarg1; arg2 = (switch_status_t (*)(switch_directory_handle_t *,char *,char *))jarg2; if (arg1) (arg1)->directory_query = arg2; + } @@ -13116,6 +13553,7 @@ arg1 = (switch_directory_interface *)jarg1; arg2 = (switch_status_t (*)(switch_directory_handle_t *))jarg2; if (arg1) (arg1)->directory_next = arg2; + } @@ -13138,6 +13576,7 @@ arg1 = (switch_directory_interface *)jarg1; arg2 = (switch_status_t (*)(switch_directory_handle_t *,char **,char **))jarg2; if (arg1) (arg1)->directory_next_pair = arg2; + } @@ -13160,6 +13599,7 @@ arg1 = (switch_directory_interface *)jarg1; arg2 = (switch_thread_rwlock_t *)jarg2; if (arg1) (arg1)->rwlock = arg2; + } @@ -13182,6 +13622,7 @@ arg1 = (switch_directory_interface *)jarg1; arg2 = (switch_directory_interface *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -13212,6 +13653,7 @@ arg1 = (switch_directory_interface *)jarg1; delete arg1; + } @@ -13222,6 +13664,7 @@ arg1 = (switch_directory_handle *)jarg1; arg2 = (switch_directory_interface_t *)jarg2; if (arg1) (arg1)->directory_interface = (switch_directory_interface_t const *)arg2; + } @@ -13244,6 +13687,7 @@ arg1 = (switch_directory_handle *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->flags = arg2; + } @@ -13266,6 +13710,7 @@ arg1 = (switch_directory_handle *)jarg1; arg2 = (switch_memory_pool_t *)jarg2; if (arg1) (arg1)->memory_pool = arg2; + } @@ -13288,6 +13733,7 @@ arg1 = (switch_directory_handle *)jarg1; arg2 = (void *)jarg2; if (arg1) (arg1)->private_info = arg2; + } @@ -13318,6 +13764,7 @@ arg1 = (switch_directory_handle *)jarg1; delete arg1; + } @@ -13328,6 +13775,7 @@ arg1 = (switch_codec_settings *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->quality = arg2; + } @@ -13350,6 +13798,7 @@ arg1 = (switch_codec_settings *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->complexity = arg2; + } @@ -13372,6 +13821,7 @@ arg1 = (switch_codec_settings *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->enhancement = arg2; + } @@ -13394,6 +13844,7 @@ arg1 = (switch_codec_settings *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->vad = arg2; + } @@ -13416,6 +13867,7 @@ arg1 = (switch_codec_settings *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->vbr = arg2; + } @@ -13438,6 +13890,7 @@ arg1 = (switch_codec_settings *)jarg1; arg2 = (float)jarg2; if (arg1) (arg1)->vbr_quality = arg2; + } @@ -13460,6 +13913,7 @@ arg1 = (switch_codec_settings *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->abr = arg2; + } @@ -13482,6 +13936,7 @@ arg1 = (switch_codec_settings *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->dtx = arg2; + } @@ -13504,6 +13959,7 @@ arg1 = (switch_codec_settings *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->preproc = arg2; + } @@ -13526,6 +13982,7 @@ arg1 = (switch_codec_settings *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->pp_vad = arg2; + } @@ -13548,6 +14005,7 @@ arg1 = (switch_codec_settings *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->pp_agc = arg2; + } @@ -13570,6 +14028,7 @@ arg1 = (switch_codec_settings *)jarg1; arg2 = (float)jarg2; if (arg1) (arg1)->pp_agc_level = arg2; + } @@ -13592,6 +14051,7 @@ arg1 = (switch_codec_settings *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->pp_denoise = arg2; + } @@ -13614,6 +14074,7 @@ arg1 = (switch_codec_settings *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->pp_dereverb = arg2; + } @@ -13636,6 +14097,7 @@ arg1 = (switch_codec_settings *)jarg1; arg2 = (float)jarg2; if (arg1) (arg1)->pp_dereverb_decay = arg2; + } @@ -13658,6 +14120,7 @@ arg1 = (switch_codec_settings *)jarg1; arg2 = (float)jarg2; if (arg1) (arg1)->pp_dereverb_level = arg2; + } @@ -13688,6 +14151,7 @@ arg1 = (switch_codec_settings *)jarg1; delete arg1; + } @@ -13698,6 +14162,7 @@ arg1 = (switch_codec *)jarg1; arg2 = (switch_codec_interface_t *)jarg2; if (arg1) (arg1)->codec_interface = (switch_codec_interface_t const *)arg2; + } @@ -13720,6 +14185,7 @@ arg1 = (switch_codec *)jarg1; arg2 = (switch_codec_implementation_t *)jarg2; if (arg1) (arg1)->implementation = (switch_codec_implementation_t const *)arg2; + } @@ -13802,6 +14268,7 @@ arg1 = (switch_codec *)jarg1; arg2 = (switch_codec_settings_t *)jarg2; if (arg1) (arg1)->codec_settings = *arg2; + } @@ -13824,6 +14291,7 @@ arg1 = (switch_codec *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->flags = arg2; + } @@ -13846,6 +14314,7 @@ arg1 = (switch_codec *)jarg1; arg2 = (switch_memory_pool_t *)jarg2; if (arg1) (arg1)->memory_pool = arg2; + } @@ -13868,6 +14337,7 @@ arg1 = (switch_codec *)jarg1; arg2 = (void *)jarg2; if (arg1) (arg1)->private_info = arg2; + } @@ -13890,6 +14360,7 @@ arg1 = (switch_codec *)jarg1; arg2 = (switch_payload_t)jarg2; if (arg1) (arg1)->agreed_pt = arg2; + } @@ -13920,6 +14391,7 @@ arg1 = (switch_codec *)jarg1; delete arg1; + } @@ -13930,6 +14402,7 @@ arg1 = (switch_codec_implementation *)jarg1; arg2 = (switch_codec_type_t)jarg2; if (arg1) (arg1)->codec_type = arg2; + } @@ -13952,6 +14425,7 @@ arg1 = (switch_codec_implementation *)jarg1; arg2 = (switch_payload_t)jarg2; if (arg1) (arg1)->ianacode = arg2; + } @@ -14034,6 +14508,7 @@ arg1 = (switch_codec_implementation *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->samples_per_second = arg2; + } @@ -14056,6 +14531,7 @@ arg1 = (switch_codec_implementation *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->actual_samples_per_second = arg2; + } @@ -14078,6 +14554,7 @@ arg1 = (switch_codec_implementation *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->bits_per_second = arg2; + } @@ -14100,6 +14577,7 @@ arg1 = (switch_codec_implementation *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->microseconds_per_frame = arg2; + } @@ -14122,6 +14600,7 @@ arg1 = (switch_codec_implementation *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->samples_per_frame = arg2; + } @@ -14144,6 +14623,7 @@ arg1 = (switch_codec_implementation *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->bytes_per_frame = arg2; + } @@ -14166,6 +14646,7 @@ arg1 = (switch_codec_implementation *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->encoded_bytes_per_frame = arg2; + } @@ -14188,6 +14669,7 @@ arg1 = (switch_codec_implementation *)jarg1; arg2 = (uint8_t)jarg2; if (arg1) (arg1)->number_of_channels = arg2; + } @@ -14210,6 +14692,7 @@ arg1 = (switch_codec_implementation *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->pref_frames_per_packet = arg2; + } @@ -14232,6 +14715,7 @@ arg1 = (switch_codec_implementation *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->max_frames_per_packet = arg2; + } @@ -14254,6 +14738,7 @@ arg1 = (switch_codec_implementation *)jarg1; arg2 = (switch_core_codec_init_func_t)jarg2; if (arg1) (arg1)->init = arg2; + } @@ -14276,6 +14761,7 @@ arg1 = (switch_codec_implementation *)jarg1; arg2 = (switch_core_codec_encode_func_t)jarg2; if (arg1) (arg1)->encode = arg2; + } @@ -14298,6 +14784,7 @@ arg1 = (switch_codec_implementation *)jarg1; arg2 = (switch_core_codec_decode_func_t)jarg2; if (arg1) (arg1)->decode = arg2; + } @@ -14320,6 +14807,7 @@ arg1 = (switch_codec_implementation *)jarg1; arg2 = (switch_core_codec_destroy_func_t)jarg2; if (arg1) (arg1)->destroy = arg2; + } @@ -14342,6 +14830,7 @@ arg1 = (switch_codec_implementation *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->codec_id = arg2; + } @@ -14364,6 +14853,7 @@ arg1 = (switch_codec_implementation *)jarg1; arg2 = (switch_codec_implementation *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -14394,6 +14884,7 @@ arg1 = (switch_codec_implementation *)jarg1; delete arg1; + } @@ -14433,6 +14924,7 @@ arg1 = (switch_codec_interface *)jarg1; arg2 = (switch_codec_implementation_t *)jarg2; if (arg1) (arg1)->implementations = arg2; + } @@ -14455,6 +14947,7 @@ arg1 = (switch_codec_interface *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->codec_id = arg2; + } @@ -14477,6 +14970,7 @@ arg1 = (switch_codec_interface *)jarg1; arg2 = (switch_thread_rwlock_t *)jarg2; if (arg1) (arg1)->rwlock = arg2; + } @@ -14499,6 +14993,7 @@ arg1 = (switch_codec_interface *)jarg1; arg2 = (switch_codec_interface *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -14529,6 +15024,7 @@ arg1 = (switch_codec_interface *)jarg1; delete arg1; + } @@ -14568,6 +15064,7 @@ arg1 = (switch_application_interface *)jarg1; arg2 = (switch_application_function_t)jarg2; if (arg1) (arg1)->application_function = arg2; + } @@ -14677,6 +15174,7 @@ arg1 = (switch_application_interface *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->flags = arg2; + } @@ -14699,6 +15197,7 @@ arg1 = (switch_application_interface *)jarg1; arg2 = (switch_thread_rwlock_t *)jarg2; if (arg1) (arg1)->rwlock = arg2; + } @@ -14721,6 +15220,7 @@ arg1 = (switch_application_interface *)jarg1; arg2 = (switch_application_interface *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -14751,6 +15251,7 @@ arg1 = (switch_application_interface *)jarg1; delete arg1; + } @@ -14819,6 +15320,7 @@ arg1 = (switch_api_interface *)jarg1; arg2 = (switch_api_function_t)jarg2; if (arg1) (arg1)->function = arg2; + } @@ -14870,6 +15372,7 @@ arg1 = (switch_api_interface *)jarg1; arg2 = (switch_thread_rwlock_t *)jarg2; if (arg1) (arg1)->rwlock = arg2; + } @@ -14892,6 +15395,7 @@ arg1 = (switch_api_interface *)jarg1; arg2 = (switch_api_interface *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -14922,6 +15426,7 @@ arg1 = (switch_api_interface *)jarg1; delete arg1; + } @@ -14938,6 +15443,7 @@ } arg2 = *argp2; if (arg1) (arg1)->profile_created = arg2; + } @@ -14948,7 +15454,7 @@ arg1 = (switch_channel_timetable *)jarg1; result = ((arg1)->profile_created); - jresult = new switch_time_t((const switch_time_t &)result); + jresult = new switch_time_t((switch_time_t &)result); return jresult; } @@ -14966,6 +15472,7 @@ } arg2 = *argp2; if (arg1) (arg1)->created = arg2; + } @@ -14976,7 +15483,7 @@ arg1 = (switch_channel_timetable *)jarg1; result = ((arg1)->created); - jresult = new switch_time_t((const switch_time_t &)result); + jresult = new switch_time_t((switch_time_t &)result); return jresult; } @@ -14994,6 +15501,7 @@ } arg2 = *argp2; if (arg1) (arg1)->answered = arg2; + } @@ -15004,7 +15512,7 @@ arg1 = (switch_channel_timetable *)jarg1; result = ((arg1)->answered); - jresult = new switch_time_t((const switch_time_t &)result); + jresult = new switch_time_t((switch_time_t &)result); return jresult; } @@ -15022,6 +15530,7 @@ } arg2 = *argp2; if (arg1) (arg1)->progress = arg2; + } @@ -15032,7 +15541,7 @@ arg1 = (switch_channel_timetable *)jarg1; result = ((arg1)->progress); - jresult = new switch_time_t((const switch_time_t &)result); + jresult = new switch_time_t((switch_time_t &)result); return jresult; } @@ -15050,6 +15559,7 @@ } arg2 = *argp2; if (arg1) (arg1)->progress_media = arg2; + } @@ -15060,7 +15570,7 @@ arg1 = (switch_channel_timetable *)jarg1; result = ((arg1)->progress_media); - jresult = new switch_time_t((const switch_time_t &)result); + jresult = new switch_time_t((switch_time_t &)result); return jresult; } @@ -15078,6 +15588,7 @@ } arg2 = *argp2; if (arg1) (arg1)->hungup = arg2; + } @@ -15088,7 +15599,7 @@ arg1 = (switch_channel_timetable *)jarg1; result = ((arg1)->hungup); - jresult = new switch_time_t((const switch_time_t &)result); + jresult = new switch_time_t((switch_time_t &)result); return jresult; } @@ -15106,6 +15617,7 @@ } arg2 = *argp2; if (arg1) (arg1)->transferred = arg2; + } @@ -15116,7 +15628,7 @@ arg1 = (switch_channel_timetable *)jarg1; result = ((arg1)->transferred); - jresult = new switch_time_t((const switch_time_t &)result); + jresult = new switch_time_t((switch_time_t &)result); return jresult; } @@ -15128,6 +15640,7 @@ arg1 = (switch_channel_timetable *)jarg1; arg2 = (switch_channel_timetable *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -15158,6 +15671,7 @@ arg1 = (switch_channel_timetable *)jarg1; delete arg1; + } @@ -15209,19 +15723,21 @@ } -SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_wait_for_flag(void * jarg1, unsigned long jarg2, int jarg3, unsigned long jarg4) { +SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_wait_for_flag(void * jarg1, unsigned long jarg2, int jarg3, unsigned long jarg4, void * jarg5) { int jresult ; switch_channel_t *arg1 = (switch_channel_t *) 0 ; switch_channel_flag_t arg2 ; switch_bool_t arg3 ; uint32_t arg4 ; + switch_channel_t *arg5 = (switch_channel_t *) 0 ; switch_status_t result; arg1 = (switch_channel_t *)jarg1; arg2 = (switch_channel_flag_t)jarg2; arg3 = (switch_bool_t)jarg3; arg4 = (uint32_t)jarg4; - result = (switch_status_t)switch_channel_wait_for_flag(arg1,arg2,arg3,arg4); + arg5 = (switch_channel_t *)jarg5; + result = (switch_status_t)switch_channel_wait_for_flag(arg1,arg2,arg3,arg4,arg5); jresult = result; return jresult; } @@ -15864,7 +16380,7 @@ arg1 = (switch_channel_t *)jarg1; result = switch_channel_has_dtmf(arg1); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -15924,8 +16440,8 @@ switch_channel_t *arg1 = (switch_channel_t *) 0 ; char *arg2 = (char *) 0 ; switch_size_t arg3 ; - switch_size_t *argp3 ; switch_size_t result; + switch_size_t *argp3 ; arg1 = (switch_channel_t *)jarg1; arg2 = (char *)jarg2; @@ -15936,7 +16452,7 @@ } arg3 = *argp3; result = switch_channel_dequeue_dtmf_string(arg1,arg2,arg3); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -16022,8 +16538,8 @@ switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ; switch_buffer_t **arg2 = (switch_buffer_t **) 0 ; switch_size_t arg3 ; - switch_size_t *argp3 ; switch_status_t result; + switch_size_t *argp3 ; arg1 = (switch_memory_pool_t *)jarg1; arg2 = (switch_buffer_t **)jarg2; @@ -16045,10 +16561,10 @@ switch_size_t arg2 ; switch_size_t arg3 ; switch_size_t arg4 ; + switch_status_t result; switch_size_t *argp2 ; switch_size_t *argp3 ; switch_size_t *argp4 ; - switch_status_t result; arg1 = (switch_buffer_t **)jarg1; argp2 = (switch_size_t *)jarg2; @@ -16120,7 +16636,7 @@ arg1 = (switch_buffer_t *)jarg1; result = switch_buffer_len(arg1); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -16132,7 +16648,7 @@ arg1 = (switch_buffer_t *)jarg1; result = switch_buffer_freespace(arg1); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -16144,7 +16660,7 @@ arg1 = (switch_buffer_t *)jarg1; result = switch_buffer_inuse(arg1); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -16154,8 +16670,8 @@ switch_buffer_t *arg1 = (switch_buffer_t *) 0 ; void *arg2 = (void *) 0 ; switch_size_t arg3 ; - switch_size_t *argp3 ; switch_size_t result; + switch_size_t *argp3 ; arg1 = (switch_buffer_t *)jarg1; arg2 = (void *)jarg2; @@ -16166,7 +16682,7 @@ } arg3 = *argp3; result = switch_buffer_read(arg1,arg2,arg3); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -16176,8 +16692,8 @@ switch_buffer_t *arg1 = (switch_buffer_t *) 0 ; void *arg2 = (void *) 0 ; switch_size_t arg3 ; - switch_size_t *argp3 ; switch_size_t result; + switch_size_t *argp3 ; arg1 = (switch_buffer_t *)jarg1; arg2 = (void *)jarg2; @@ -16188,7 +16704,7 @@ } arg3 = *argp3; result = switch_buffer_read_loop(arg1,arg2,arg3); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -16208,8 +16724,8 @@ switch_buffer_t *arg1 = (switch_buffer_t *) 0 ; void *arg2 = (void *) 0 ; switch_size_t arg3 ; - switch_size_t *argp3 ; switch_size_t result; + switch_size_t *argp3 ; arg1 = (switch_buffer_t *)jarg1; arg2 = (void *)jarg2; @@ -16220,7 +16736,7 @@ } arg3 = *argp3; result = switch_buffer_write(arg1,(void const *)arg2,arg3); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -16229,8 +16745,8 @@ void * jresult ; switch_buffer_t *arg1 = (switch_buffer_t *) 0 ; switch_size_t arg2 ; - switch_size_t *argp2 ; switch_size_t result; + switch_size_t *argp2 ; arg1 = (switch_buffer_t *)jarg1; argp2 = (switch_size_t *)jarg2; @@ -16240,7 +16756,7 @@ } arg2 = *argp2; result = switch_buffer_toss(arg1,arg2); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -16266,8 +16782,8 @@ switch_buffer_t *arg1 = (switch_buffer_t *) 0 ; void *arg2 = (void *) 0 ; switch_size_t arg3 ; - switch_size_t *argp3 ; switch_size_t result; + switch_size_t *argp3 ; arg1 = (switch_buffer_t *)jarg1; arg2 = (void *)jarg2; @@ -16278,7 +16794,7 @@ } arg3 = *argp3; result = switch_buffer_zwrite(arg1,(void const *)arg2,arg3); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -16350,6 +16866,7 @@ arg1 = (switch_event_header *)jarg1; arg2 = (switch_event_header *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -16380,6 +16897,7 @@ arg1 = (switch_event_header *)jarg1; delete arg1; + } @@ -16390,6 +16908,7 @@ arg1 = (switch_event *)jarg1; arg2 = (switch_event_types_t)jarg2; if (arg1) (arg1)->event_id = arg2; + } @@ -16412,6 +16931,7 @@ arg1 = (switch_event *)jarg1; arg2 = (switch_priority_t)jarg2; if (arg1) (arg1)->priority = arg2; + } @@ -16494,6 +17014,7 @@ arg1 = (switch_event *)jarg1; arg2 = (switch_event_header_t *)jarg2; if (arg1) (arg1)->headers = arg2; + } @@ -16516,6 +17037,7 @@ arg1 = (switch_event *)jarg1; arg2 = (switch_event_header_t *)jarg2; if (arg1) (arg1)->last_header = arg2; + } @@ -16568,6 +17090,7 @@ arg1 = (switch_event *)jarg1; arg2 = (void *)jarg2; if (arg1) (arg1)->bind_user_data = arg2; + } @@ -16590,6 +17113,7 @@ arg1 = (switch_event *)jarg1; arg2 = (void *)jarg2; if (arg1) (arg1)->event_user_data = arg2; + } @@ -16612,6 +17136,7 @@ arg1 = (switch_event *)jarg1; arg2 = (unsigned long)jarg2; if (arg1) (arg1)->key = arg2; + } @@ -16634,6 +17159,7 @@ arg1 = (switch_event *)jarg1; arg2 = (switch_event *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -16664,6 +17190,7 @@ arg1 = (switch_event *)jarg1; delete arg1; + } @@ -17050,6 +17577,7 @@ arg1 = (switch_audio_resampler_t *)jarg1; arg2 = (void *)jarg2; if (arg1) (arg1)->resampler = arg2; + } @@ -17072,6 +17600,7 @@ arg1 = (switch_audio_resampler_t *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->from_rate = arg2; + } @@ -17094,6 +17623,7 @@ arg1 = (switch_audio_resampler_t *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->to_rate = arg2; + } @@ -17116,6 +17646,7 @@ arg1 = (switch_audio_resampler_t *)jarg1; arg2 = (double)jarg2; if (arg1) (arg1)->factor = arg2; + } @@ -17138,6 +17669,7 @@ arg1 = (switch_audio_resampler_t *)jarg1; arg2 = (double)jarg2; if (arg1) (arg1)->rfactor = arg2; + } @@ -17160,6 +17692,7 @@ arg1 = (switch_audio_resampler_t *)jarg1; arg2 = (float *)jarg2; if (arg1) (arg1)->from = arg2; + } @@ -17182,6 +17715,7 @@ arg1 = (switch_audio_resampler_t *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->from_len = arg2; + } @@ -17210,6 +17744,7 @@ } arg2 = *argp2; if (arg1) (arg1)->from_size = arg2; + } @@ -17220,7 +17755,7 @@ arg1 = (switch_audio_resampler_t *)jarg1; result = ((arg1)->from_size); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -17232,6 +17767,7 @@ arg1 = (switch_audio_resampler_t *)jarg1; arg2 = (float *)jarg2; if (arg1) (arg1)->to = arg2; + } @@ -17254,6 +17790,7 @@ arg1 = (switch_audio_resampler_t *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->to_len = arg2; + } @@ -17276,6 +17813,7 @@ arg1 = (switch_audio_resampler_t *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->to_size = arg2; + } @@ -17306,6 +17844,7 @@ arg1 = (switch_audio_resampler_t *)jarg1; delete arg1; + } @@ -17317,8 +17856,8 @@ int arg4 ; uint32_t arg5 ; switch_memory_pool_t *arg6 = (switch_memory_pool_t *) 0 ; - switch_size_t *argp3 ; switch_status_t result; + switch_size_t *argp3 ; arg1 = (switch_audio_resampler_t **)jarg1; arg2 = (int)jarg2; @@ -17372,8 +17911,8 @@ float *arg1 = (float *) 0 ; short *arg2 = (short *) 0 ; switch_size_t arg3 ; - switch_size_t *argp3 ; switch_size_t result; + switch_size_t *argp3 ; arg1 = (float *)jarg1; arg2 = (short *)jarg2; @@ -17384,7 +17923,7 @@ } arg3 = *argp3; result = switch_float_to_short(arg1,arg2,arg3); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -17496,6 +18035,7 @@ arg1 = (switch_unicast_conninfo *)jarg1; arg2 = (switch_core_session_t *)jarg2; if (arg1) (arg1)->session = arg2; + } @@ -17518,6 +18058,7 @@ arg1 = (switch_unicast_conninfo *)jarg1; arg2 = (switch_codec_t *)jarg2; if (arg1) (arg1)->read_codec = *arg2; + } @@ -17540,6 +18081,7 @@ arg1 = (switch_unicast_conninfo *)jarg1; arg2 = (switch_frame_t *)jarg2; if (arg1) (arg1)->write_frame = *arg2; + } @@ -17588,6 +18130,7 @@ arg1 = (switch_unicast_conninfo *)jarg1; arg2 = (switch_socket_t *)jarg2; if (arg1) (arg1)->socket = arg2; + } @@ -17640,6 +18183,7 @@ arg1 = (switch_unicast_conninfo *)jarg1; arg2 = (switch_port_t)jarg2; if (arg1) (arg1)->local_port = arg2; + } @@ -17692,6 +18236,7 @@ arg1 = (switch_unicast_conninfo *)jarg1; arg2 = (switch_port_t)jarg2; if (arg1) (arg1)->remote_port = arg2; + } @@ -17714,6 +18259,7 @@ arg1 = (switch_unicast_conninfo *)jarg1; arg2 = (switch_sockaddr_t *)jarg2; if (arg1) (arg1)->local_addr = arg2; + } @@ -17736,6 +18282,7 @@ arg1 = (switch_unicast_conninfo *)jarg1; arg2 = (switch_sockaddr_t *)jarg2; if (arg1) (arg1)->remote_addr = arg2; + } @@ -17758,6 +18305,7 @@ arg1 = (switch_unicast_conninfo *)jarg1; arg2 = (switch_mutex_t *)jarg2; if (arg1) (arg1)->flag_mutex = arg2; + } @@ -17780,6 +18328,7 @@ arg1 = (switch_unicast_conninfo *)jarg1; arg2 = (int32_t)jarg2; if (arg1) (arg1)->flags = arg2; + } @@ -17802,6 +18351,7 @@ arg1 = (switch_unicast_conninfo *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->type = arg2; + } @@ -17824,6 +18374,7 @@ arg1 = (switch_unicast_conninfo *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->transport = arg2; + } @@ -17846,6 +18397,7 @@ arg1 = (switch_unicast_conninfo *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->stream_id = arg2; + } @@ -17876,6 +18428,7 @@ arg1 = (switch_unicast_conninfo *)jarg1; delete arg1; + } @@ -18056,9 +18609,9 @@ uint32_t arg7 ; uint32_t arg8 ; uint32_t arg9 ; + switch_status_t result; switch_size_t *argp3 ; switch_size_t *argp4 ; - switch_status_t result; arg1 = (switch_core_session_t *)jarg1; arg2 = (char *)jarg2; @@ -18334,8 +18887,8 @@ time_t arg5 ; char *arg6 = (char *) 0 ; char *arg7 = (char *) 0 ; - time_t *argp5 ; switch_status_t result; + time_t *argp5 ; arg1 = (switch_core_session_t *)jarg1; arg2 = (char *)jarg2; @@ -18604,8 +19157,8 @@ char *arg3 = (char *) 0 ; char *arg4 = (char *) 0 ; char *arg5 = (char *) 0 ; - time_t *argp1 ; uint32_t result; + time_t *argp1 ; argp1 = (time_t *)jarg1; if (!argp1) { @@ -18629,8 +19182,8 @@ char *arg2 = (char *) 0 ; switch_call_cause_t arg3 ; switch_bool_t arg4 ; - time_t *argp1 ; uint32_t result; + time_t *argp1 ; argp1 = (time_t *)jarg1; if (!argp1) { @@ -18751,8 +19304,8 @@ char *arg2 = (char *) 0 ; char *arg3 = (char *) 0 ; switch_media_flag_t arg4 ; - time_t *argp1 ; uint32_t result; + time_t *argp1 ; argp1 = (time_t *)jarg1; if (!argp1) { @@ -19128,8 +19681,8 @@ char *arg1 = (char *) 0 ; char *arg2 = (char *) 0 ; switch_size_t arg3 ; - switch_size_t *argp3 ; switch_status_t result; + switch_size_t *argp3 ; arg1 = (char *)jarg1; arg2 = (char *)jarg2; @@ -19190,8 +19743,8 @@ switch_size_t arg7 ; uint32_t arg8 ; char *arg9 = (char *) 0 ; - switch_size_t *argp7 ; switch_status_t result; + switch_size_t *argp7 ; arg1 = (switch_core_session_t *)jarg1; arg2 = (uint32_t)jarg2; @@ -19326,6 +19879,7 @@ int result; result = (int) 16384; + jresult = result; return jresult; } @@ -19336,6 +19890,7 @@ int result; result = (int) 64; + jresult = result; return jresult; } @@ -19346,6 +19901,7 @@ int result; result = (int) 30; + jresult = result; return jresult; } @@ -19356,6 +19912,7 @@ char *result = 0 ; result = (char *) "AES_CM_128_HMAC_SHA1_32"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -19366,6 +19923,7 @@ char *result = 0 ; result = (char *) "AES_CM_128_HMAC_SHA1_80"; + jresult = SWIG_csharp_string_callback((const char *)result); return jresult; } @@ -19378,6 +19936,7 @@ arg1 = (switch_rtp_crypto_key *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->index = arg2; + } @@ -19400,6 +19959,7 @@ arg1 = (switch_rtp_crypto_key *)jarg1; arg2 = (switch_rtp_crypto_key_type_t)jarg2; if (arg1) (arg1)->type = arg2; + } @@ -19454,6 +20014,7 @@ } arg2 = *argp2; if (arg1) (arg1)->keylen = arg2; + } @@ -19464,7 +20025,7 @@ arg1 = (switch_rtp_crypto_key *)jarg1; result = ((arg1)->keylen); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -19476,6 +20037,7 @@ arg1 = (switch_rtp_crypto_key *)jarg1; arg2 = (switch_rtp_crypto_key *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -19506,6 +20068,7 @@ arg1 = (switch_rtp_crypto_key *)jarg1; delete arg1; + } @@ -19517,8 +20080,8 @@ switch_rtp_crypto_key_type_t arg4 ; unsigned char *arg5 = (unsigned char *) 0 ; switch_size_t arg6 ; - switch_size_t *argp6 ; switch_status_t result; + switch_size_t *argp6 ; arg1 = (switch_rtp_t *)jarg1; arg2 = (switch_rtp_crypto_direction_t)jarg2; @@ -19933,7 +20496,7 @@ arg1 = (switch_rtp_t *)jarg1; result = switch_rtp_has_dtmf(arg1); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -19947,7 +20510,7 @@ arg1 = (switch_rtp_t *)jarg1; arg2 = (switch_dtmf_t *)jarg2; result = switch_rtp_dequeue_dtmf(arg1,arg2); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -20194,6 +20757,7 @@ arg1 = (switch_log_node_t *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->line = arg2; + } @@ -20241,6 +20805,7 @@ arg1 = (switch_log_node_t *)jarg1; arg2 = (switch_log_level_t)jarg2; if (arg1) (arg1)->level = arg2; + } @@ -20269,6 +20834,7 @@ } arg2 = *argp2; if (arg1) (arg1)->timestamp = arg2; + } @@ -20279,7 +20845,7 @@ arg1 = (switch_log_node_t *)jarg1; result = ((arg1)->timestamp); - jresult = new switch_time_t((const switch_time_t &)result); + jresult = new switch_time_t((switch_time_t &)result); return jresult; } @@ -20358,6 +20924,7 @@ arg1 = (switch_log_node_t *)jarg1; delete arg1; + } @@ -20454,6 +21021,7 @@ int result; result = (int) 1024; + jresult = result; return jresult; } @@ -20496,6 +21064,7 @@ arg1 = (switch_xml *)jarg1; arg2 = (char **)jarg2; if (arg1) (arg1)->attr = arg2; + } @@ -20584,6 +21153,7 @@ } arg2 = *argp2; if (arg1) (arg1)->off = arg2; + } @@ -20594,7 +21164,7 @@ arg1 = (switch_xml *)jarg1; result = ((arg1)->off); - jresult = new switch_size_t((const switch_size_t &)result); + jresult = new switch_size_t((switch_size_t &)result); return jresult; } @@ -20606,6 +21176,7 @@ arg1 = (switch_xml *)jarg1; arg2 = (switch_xml_t)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -20628,6 +21199,7 @@ arg1 = (switch_xml *)jarg1; arg2 = (switch_xml_t)jarg2; if (arg1) (arg1)->sibling = arg2; + } @@ -20650,6 +21222,7 @@ arg1 = (switch_xml *)jarg1; arg2 = (switch_xml_t)jarg2; if (arg1) (arg1)->ordered = arg2; + } @@ -20672,6 +21245,7 @@ arg1 = (switch_xml *)jarg1; arg2 = (switch_xml_t)jarg2; if (arg1) (arg1)->child = arg2; + } @@ -20694,6 +21268,7 @@ arg1 = (switch_xml *)jarg1; arg2 = (switch_xml_t)jarg2; if (arg1) (arg1)->parent = arg2; + } @@ -20716,6 +21291,7 @@ arg1 = (switch_xml *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->flags = arg2; + } @@ -20746,6 +21322,7 @@ arg1 = (switch_xml *)jarg1; delete arg1; + } @@ -20753,8 +21330,8 @@ void * jresult ; char *arg1 = (char *) 0 ; switch_size_t arg2 ; - switch_size_t *argp2 ; switch_xml_t result; + switch_size_t *argp2 ; arg1 = (char *)jarg1; argp2 = (switch_size_t *)jarg2; @@ -20911,9 +21488,9 @@ switch_size_t arg3 ; switch_size_t arg4 ; switch_bool_t arg5 ; + char *result = 0 ; switch_size_t *argp3 ; switch_size_t *argp4 ; - char *result = 0 ; arg1 = (switch_xml_t)jarg1; arg2 = (char *)jarg2; @@ -20936,20 +21513,6 @@ } -SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_pi(void * jarg1, char * jarg2) { - void * jresult ; - switch_xml_t arg1 = (switch_xml_t) 0 ; - char *arg2 = (char *) 0 ; - char **result = 0 ; - - arg1 = (switch_xml_t)jarg1; - arg2 = (char *)jarg2; - result = (char **)switch_xml_pi(arg1,(char const *)arg2); - jresult = (void *)result; - return jresult; -} - - SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_free(void * jarg1) { switch_xml_t arg1 = (switch_xml_t) 0 ; @@ -20997,8 +21560,8 @@ switch_xml_t arg1 = (switch_xml_t) 0 ; char *arg2 = (char *) 0 ; switch_size_t arg3 ; - switch_size_t *argp3 ; switch_xml_t result; + switch_size_t *argp3 ; arg1 = (switch_xml_t)jarg1; arg2 = (char *)jarg2; @@ -21075,8 +21638,8 @@ switch_xml_t arg1 = (switch_xml_t) 0 ; switch_xml_t arg2 = (switch_xml_t) 0 ; switch_size_t arg3 ; - switch_size_t *argp3 ; switch_xml_t result; + switch_size_t *argp3 ; arg1 = (switch_xml_t)jarg1; arg2 = (switch_xml_t)jarg2; @@ -21283,6 +21846,7 @@ arg1 = (switch_io_event_hook_outgoing_channel *)jarg1; arg2 = (switch_outgoing_channel_hook_t)jarg2; if (arg1) (arg1)->outgoing_channel = arg2; + } @@ -21305,6 +21869,7 @@ arg1 = (switch_io_event_hook_outgoing_channel *)jarg1; arg2 = (switch_io_event_hook_outgoing_channel *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -21335,6 +21900,7 @@ arg1 = (switch_io_event_hook_outgoing_channel *)jarg1; delete arg1; + } @@ -21345,6 +21911,7 @@ arg1 = (switch_io_event_hook_receive_message *)jarg1; arg2 = (switch_receive_message_hook_t)jarg2; if (arg1) (arg1)->receive_message = arg2; + } @@ -21367,6 +21934,7 @@ arg1 = (switch_io_event_hook_receive_message *)jarg1; arg2 = (switch_io_event_hook_receive_message *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -21397,6 +21965,7 @@ arg1 = (switch_io_event_hook_receive_message *)jarg1; delete arg1; + } @@ -21407,6 +21976,7 @@ arg1 = (switch_io_event_hook_receive_event *)jarg1; arg2 = (switch_receive_event_hook_t)jarg2; if (arg1) (arg1)->receive_event = arg2; + } @@ -21429,6 +21999,7 @@ arg1 = (switch_io_event_hook_receive_event *)jarg1; arg2 = (switch_io_event_hook_receive_event *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -21459,6 +22030,7 @@ arg1 = (switch_io_event_hook_receive_event *)jarg1; delete arg1; + } @@ -21469,6 +22041,7 @@ arg1 = (switch_io_event_hook_read_frame *)jarg1; arg2 = (switch_read_frame_hook_t)jarg2; if (arg1) (arg1)->read_frame = arg2; + } @@ -21491,6 +22064,7 @@ arg1 = (switch_io_event_hook_read_frame *)jarg1; arg2 = (switch_io_event_hook_read_frame *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -21521,6 +22095,7 @@ arg1 = (switch_io_event_hook_read_frame *)jarg1; delete arg1; + } @@ -21531,6 +22106,7 @@ arg1 = (switch_io_event_hook_video_read_frame *)jarg1; arg2 = (switch_read_frame_hook_t)jarg2; if (arg1) (arg1)->video_read_frame = arg2; + } @@ -21553,6 +22129,7 @@ arg1 = (switch_io_event_hook_video_read_frame *)jarg1; arg2 = (switch_io_event_hook_video_read_frame *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -21583,6 +22160,7 @@ arg1 = (switch_io_event_hook_video_read_frame *)jarg1; delete arg1; + } @@ -21593,6 +22171,7 @@ arg1 = (switch_io_event_hook_write_frame *)jarg1; arg2 = (switch_write_frame_hook_t)jarg2; if (arg1) (arg1)->write_frame = arg2; + } @@ -21615,6 +22194,7 @@ arg1 = (switch_io_event_hook_write_frame *)jarg1; arg2 = (switch_io_event_hook_write_frame *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -21645,6 +22225,7 @@ arg1 = (switch_io_event_hook_write_frame *)jarg1; delete arg1; + } @@ -21655,6 +22236,7 @@ arg1 = (switch_io_event_hook_video_write_frame *)jarg1; arg2 = (switch_video_write_frame_hook_t)jarg2; if (arg1) (arg1)->video_write_frame = arg2; + } @@ -21677,6 +22259,7 @@ arg1 = (switch_io_event_hook_video_write_frame *)jarg1; arg2 = (switch_io_event_hook_video_write_frame *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -21707,6 +22290,7 @@ arg1 = (switch_io_event_hook_video_write_frame *)jarg1; delete arg1; + } @@ -21717,6 +22301,7 @@ arg1 = (switch_io_event_hook_kill_channel *)jarg1; arg2 = (switch_kill_channel_hook_t)jarg2; if (arg1) (arg1)->kill_channel = arg2; + } @@ -21739,6 +22324,7 @@ arg1 = (switch_io_event_hook_kill_channel *)jarg1; arg2 = (switch_io_event_hook_kill_channel *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -21769,6 +22355,7 @@ arg1 = (switch_io_event_hook_kill_channel *)jarg1; delete arg1; + } @@ -21779,6 +22366,7 @@ arg1 = (switch_io_event_hook_send_dtmf *)jarg1; arg2 = (switch_send_dtmf_hook_t)jarg2; if (arg1) (arg1)->send_dtmf = arg2; + } @@ -21801,6 +22389,7 @@ arg1 = (switch_io_event_hook_send_dtmf *)jarg1; arg2 = (switch_io_event_hook_send_dtmf *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -21831,6 +22420,7 @@ arg1 = (switch_io_event_hook_send_dtmf *)jarg1; delete arg1; + } @@ -21841,6 +22431,7 @@ arg1 = (switch_io_event_hook_recv_dtmf *)jarg1; arg2 = (switch_recv_dtmf_hook_t)jarg2; if (arg1) (arg1)->recv_dtmf = arg2; + } @@ -21863,6 +22454,7 @@ arg1 = (switch_io_event_hook_recv_dtmf *)jarg1; arg2 = (switch_io_event_hook_recv_dtmf *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -21893,6 +22485,7 @@ arg1 = (switch_io_event_hook_recv_dtmf *)jarg1; delete arg1; + } @@ -21903,6 +22496,7 @@ arg1 = (switch_io_event_hook_state_change *)jarg1; arg2 = (switch_state_change_hook_t)jarg2; if (arg1) (arg1)->state_change = arg2; + } @@ -21925,6 +22519,7 @@ arg1 = (switch_io_event_hook_state_change *)jarg1; arg2 = (switch_io_event_hook_state_change *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -21955,6 +22550,7 @@ arg1 = (switch_io_event_hook_state_change *)jarg1; delete arg1; + } @@ -21965,6 +22561,7 @@ arg1 = (switch_io_event_hook_resurrect_session *)jarg1; arg2 = (switch_resurrect_session_hook_t)jarg2; if (arg1) (arg1)->resurrect_session = arg2; + } @@ -21987,6 +22584,7 @@ arg1 = (switch_io_event_hook_resurrect_session *)jarg1; arg2 = (switch_io_event_hook_resurrect_session *)jarg2; if (arg1) (arg1)->next = arg2; + } @@ -22017,6 +22615,7 @@ arg1 = (switch_io_event_hook_resurrect_session *)jarg1; delete arg1; + } @@ -22027,6 +22626,7 @@ arg1 = (switch_io_event_hooks *)jarg1; arg2 = (switch_io_event_hook_outgoing_channel_t *)jarg2; if (arg1) (arg1)->outgoing_channel = arg2; + } @@ -22049,6 +22649,7 @@ arg1 = (switch_io_event_hooks *)jarg1; arg2 = (switch_io_event_hook_receive_message_t *)jarg2; if (arg1) (arg1)->receive_message = arg2; + } @@ -22071,6 +22672,7 @@ arg1 = (switch_io_event_hooks *)jarg1; arg2 = (switch_io_event_hook_receive_event_t *)jarg2; if (arg1) (arg1)->receive_event = arg2; + } @@ -22093,6 +22695,7 @@ arg1 = (switch_io_event_hooks *)jarg1; arg2 = (switch_io_event_hook_read_frame_t *)jarg2; if (arg1) (arg1)->read_frame = arg2; + } @@ -22115,6 +22718,7 @@ arg1 = (switch_io_event_hooks *)jarg1; arg2 = (switch_io_event_hook_video_read_frame_t *)jarg2; if (arg1) (arg1)->video_read_frame = arg2; + } @@ -22137,6 +22741,7 @@ arg1 = (switch_io_event_hooks *)jarg1; arg2 = (switch_io_event_hook_write_frame_t *)jarg2; if (arg1) (arg1)->write_frame = arg2; + } @@ -22159,6 +22764,7 @@ arg1 = (switch_io_event_hooks *)jarg1; arg2 = (switch_io_event_hook_video_write_frame_t *)jarg2; if (arg1) (arg1)->video_write_frame = arg2; + } @@ -22181,6 +22787,7 @@ arg1 = (switch_io_event_hooks *)jarg1; arg2 = (switch_io_event_hook_kill_channel_t *)jarg2; if (arg1) (arg1)->kill_channel = arg2; + } @@ -22203,6 +22810,7 @@ arg1 = (switch_io_event_hooks *)jarg1; arg2 = (switch_io_event_hook_send_dtmf_t *)jarg2; if (arg1) (arg1)->send_dtmf = arg2; + } @@ -22225,6 +22833,7 @@ arg1 = (switch_io_event_hooks *)jarg1; arg2 = (switch_io_event_hook_recv_dtmf_t *)jarg2; if (arg1) (arg1)->recv_dtmf = arg2; + } @@ -22247,6 +22856,7 @@ arg1 = (switch_io_event_hooks *)jarg1; arg2 = (switch_io_event_hook_state_change_t *)jarg2; if (arg1) (arg1)->state_change = arg2; + } @@ -22269,6 +22879,7 @@ arg1 = (switch_io_event_hooks *)jarg1; arg2 = (switch_io_event_hook_resurrect_session_t *)jarg2; if (arg1) (arg1)->resurrect_session = arg2; + } @@ -22299,6 +22910,7 @@ arg1 = (switch_io_event_hooks *)jarg1; delete arg1; + } @@ -22645,6 +23257,7 @@ arg1 = (switch_scheduler_task *)jarg1; arg2 = (int64_t)jarg2; if (arg1) (arg1)->created = arg2; + } @@ -22667,6 +23280,7 @@ arg1 = (switch_scheduler_task *)jarg1; arg2 = (int64_t)jarg2; if (arg1) (arg1)->runtime = arg2; + } @@ -22689,6 +23303,7 @@ arg1 = (switch_scheduler_task *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->cmd_id = arg2; + } @@ -22741,6 +23356,7 @@ arg1 = (switch_scheduler_task *)jarg1; arg2 = (void *)jarg2; if (arg1) (arg1)->cmd_arg = arg2; + } @@ -22763,6 +23379,7 @@ arg1 = (switch_scheduler_task *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->task_id = arg2; + } @@ -22793,6 +23410,7 @@ arg1 = (switch_scheduler_task *)jarg1; delete arg1; + } @@ -22805,8 +23423,8 @@ uint32_t arg5 ; void *arg6 = (void *) 0 ; switch_scheduler_flag_t arg7 ; - time_t *argp1 ; uint32_t result; + time_t *argp1 ; argp1 = (time_t *)jarg1; if (!argp1) { @@ -22867,6 +23485,7 @@ arg1 = (switch_config *)jarg1; arg2 = (FILE *)jarg2; if (arg1) (arg1)->file = arg2; + } @@ -22989,6 +23608,7 @@ arg1 = (switch_config *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->lineno = arg2; + } @@ -23011,6 +23631,7 @@ arg1 = (switch_config *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->catno = arg2; + } @@ -23033,6 +23654,7 @@ arg1 = (switch_config *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->sectno = arg2; + } @@ -23055,6 +23677,7 @@ arg1 = (switch_config *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->lockto = arg2; + } @@ -23085,6 +23708,7 @@ arg1 = (switch_config *)jarg1; delete arg1; + } @@ -23185,6 +23809,7 @@ arg1 = (IVRMenu *)jarg1; delete arg1; + } @@ -23229,6 +23854,7 @@ arg1 = (API *)jarg1; delete arg1; + } @@ -23269,6 +23895,7 @@ arg1 = (input_callback_state_t *)jarg1; arg2 = (void *)jarg2; if (arg1) (arg1)->function = arg2; + } @@ -23291,6 +23918,7 @@ arg1 = (input_callback_state_t *)jarg1; arg2 = (void *)jarg2; if (arg1) (arg1)->threadState = arg2; + } @@ -23313,6 +23941,7 @@ arg1 = (input_callback_state_t *)jarg1; arg2 = (void *)jarg2; if (arg1) (arg1)->extra = arg2; + } @@ -23373,6 +24002,7 @@ arg1 = (input_callback_state_t *)jarg1; delete arg1; + } @@ -23383,6 +24013,7 @@ arg1 = (DTMF *)jarg1; arg2 = (char)jarg2; if (arg1) (arg1)->digit = arg2; + } @@ -23405,6 +24036,7 @@ arg1 = (DTMF *)jarg1; arg2 = (uint32_t)jarg2; if (arg1) (arg1)->duration = arg2; + } @@ -23439,6 +24071,7 @@ arg1 = (DTMF *)jarg1; delete arg1; + } @@ -23469,6 +24102,7 @@ arg1 = (Stream *)jarg1; delete arg1; + } @@ -23501,6 +24135,7 @@ arg1 = (Event *)jarg1; arg2 = (switch_event_t *)jarg2; if (arg1) (arg1)->event = arg2; + } @@ -23553,6 +24188,7 @@ arg1 = (Event *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->mine = arg2; + } @@ -23601,6 +24237,7 @@ arg1 = (Event *)jarg1; delete arg1; + } @@ -23733,6 +24370,7 @@ arg1 = (EventConsumer *)jarg1; arg2 = (switch_queue_t *)jarg2; if (arg1) (arg1)->events = arg2; + } @@ -23755,6 +24393,7 @@ arg1 = (EventConsumer *)jarg1; arg2 = (switch_event_types_t)jarg2; if (arg1) (arg1)->e_event_id = arg2; + } @@ -23777,6 +24416,7 @@ arg1 = (EventConsumer *)jarg1; arg2 = (switch_event_node_t *)jarg2; if (arg1) (arg1)->node = arg2; + } @@ -23901,6 +24541,7 @@ arg1 = (EventConsumer *)jarg1; delete arg1; + } @@ -23923,6 +24564,7 @@ arg1 = (CoreSession *)jarg1; delete arg1; + } @@ -23933,6 +24575,7 @@ arg1 = (CoreSession *)jarg1; arg2 = (switch_core_session_t *)jarg2; if (arg1) (arg1)->session = arg2; + } @@ -23955,6 +24598,7 @@ arg1 = (CoreSession *)jarg1; arg2 = (switch_channel_t *)jarg2; if (arg1) (arg1)->channel = arg2; + } @@ -23977,6 +24621,7 @@ arg1 = (CoreSession *)jarg1; arg2 = (unsigned int)jarg2; if (arg1) (arg1)->flags = arg2; + } @@ -23999,6 +24644,7 @@ arg1 = (CoreSession *)jarg1; arg2 = (int)jarg2; if (arg1) (arg1)->allocated = arg2; + } @@ -24021,6 +24667,7 @@ arg1 = (CoreSession *)jarg1; arg2 = (input_callback_state *)jarg2; if (arg1) (arg1)->cb_state = *arg2; + } @@ -24043,6 +24690,7 @@ arg1 = (CoreSession *)jarg1; arg2 = (switch_channel_state_t)jarg2; if (arg1) (arg1)->hook_state = arg2; + } @@ -24314,6 +24962,14 @@ } +SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_destroy(void * jarg1) { + CoreSession *arg1 = (CoreSession *) 0 ; + + arg1 = (CoreSession *)jarg1; + (arg1)->destroy(); +} + + SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_Speak(void * jarg1, char * jarg2) { int jresult ; CoreSession *arg1 = (CoreSession *) 0 ; @@ -24784,6 +25440,7 @@ arg1 = (MonoSession *)jarg1; delete arg1; + } Modified: freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.vcproj Wed Sep 17 18:46:07 2008 @@ -96,10 +96,11 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" + OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" - CharacterSet="1" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="0" WholeProgramOptimization="1" > <Tool @@ -121,12 +122,14 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories=""C:\Program Files\Mono\lib\glib-2.0\include";"C:\Program Files\Mono\include\glib-2.0";"C:\Program Files\Mono\include\mono-1.0"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_MONO_EXPORTS" RuntimeLibrary="2" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" DebugInformationFormat="3" + DisableSpecificWarnings="4505" /> <Tool Name="VCManagedResourceCompilerTool" @@ -139,6 +142,7 @@ /> <Tool Name="VCLinkerTool" + AdditionalDependencies="$(ProjectDir)mono.lib 
"C:\program Files\Mono\lib\glib-2.0.lib" shlwapi.lib" LinkIncremental="1" ModuleDefinitionFile="mono.def" GenerateDebugInformation="true" Modified: freeswitch/trunk/src/mod/languages/mod_mono_managed/mod_mono_managed.csproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_mono_managed/mod_mono_managed.csproj (original) +++ freeswitch/trunk/src/mod/languages/mod_mono_managed/mod_mono_managed.csproj Wed Sep 17 18:46:07 2008 @@ -27,7 +27,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>bin\Release\</OutputPath> + <OutputPath>..\..\..\..\Release\mod\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> Modified: freeswitch/trunk/src/mod/languages/mod_mono_managed/swig.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_mono_managed/swig.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_mono_managed/swig.cs Wed Sep 17 18:46:07 2008 @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -57,7 +57,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -244,6 +244,10 @@ return ret; } + public void destroy() { + freeswitchPINVOKE.CoreSession_destroy(swigCPtr); + } + public int Speak(string text) { int ret = freeswitchPINVOKE.CoreSession_Speak(swigCPtr, text); return ret; @@ -373,7 +377,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -440,7 +444,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -566,7 +570,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -681,7 +685,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -735,8 +739,8 @@ return ret; } - public static int switch_core_db_exec(SWIGTYPE_p_sqlite3 db, string sql, SWIGTYPE_p_f_p_void_int_p_p_char_p_p_char__int callback, SWIGTYPE_p_void data, SWIGTYPE_p_p_char errmsg) { - int ret = freeswitchPINVOKE.switch_core_db_exec(SWIGTYPE_p_sqlite3.getCPtr(db), sql, SWIGTYPE_p_f_p_void_int_p_p_char_p_p_char__int.getCPtr(callback), SWIGTYPE_p_void.getCPtr(data), SWIGTYPE_p_p_char.getCPtr(errmsg)); + public static int switch_core_db_exec(SWIGTYPE_p_sqlite3 db, string sql, SWIGTYPE_p_f_p_void_int_p_p_char_p_p_char__int callback, SWIGTYPE_p_void data, ref string errmsg) { + int ret = freeswitchPINVOKE.switch_core_db_exec(SWIGTYPE_p_sqlite3.getCPtr(db), sql, SWIGTYPE_p_f_p_void_int_p_p_char_p_p_char__int.getCPtr(callback), SWIGTYPE_p_void.getCPtr(data), ref errmsg); return ret; } @@ -745,8 +749,8 @@ return ret; } - public static int switch_core_db_prepare(SWIGTYPE_p_sqlite3 db, string zSql, int nBytes, SWIGTYPE_p_p_sqlite3_stmt ppStmt, SWIGTYPE_p_p_char pzTail) { - int ret = freeswitchPINVOKE.switch_core_db_prepare(SWIGTYPE_p_sqlite3.getCPtr(db), zSql, nBytes, SWIGTYPE_p_p_sqlite3_stmt.getCPtr(ppStmt), SWIGTYPE_p_p_char.getCPtr(pzTail)); + public static int switch_core_db_prepare(SWIGTYPE_p_sqlite3 db, string zSql, int nBytes, SWIGTYPE_p_p_sqlite3_stmt ppStmt, ref string pzTail) { + int ret = freeswitchPINVOKE.switch_core_db_prepare(SWIGTYPE_p_sqlite3.getCPtr(db), zSql, nBytes, SWIGTYPE_p_p_sqlite3_stmt.getCPtr(ppStmt), ref pzTail); return ret; } @@ -785,13 +789,13 @@ return ret; } - public static int switch_core_db_get_table(SWIGTYPE_p_sqlite3 db, string sql, SWIGTYPE_p_p_p_char resultp, SWIGTYPE_p_int nrow, SWIGTYPE_p_int ncolumn, SWIGTYPE_p_p_char errmsg) { - int ret = freeswitchPINVOKE.switch_core_db_get_table(SWIGTYPE_p_sqlite3.getCPtr(db), sql, SWIGTYPE_p_p_p_char.getCPtr(resultp), SWIGTYPE_p_int.getCPtr(nrow), SWIGTYPE_p_int.getCPtr(ncolumn), SWIGTYPE_p_p_char.getCPtr(errmsg)); + public static int switch_core_db_get_table(SWIGTYPE_p_sqlite3 db, string sql, SWIGTYPE_p_p_p_char resultp, SWIGTYPE_p_int nrow, SWIGTYPE_p_int ncolumn, ref string errmsg) { + int ret = freeswitchPINVOKE.switch_core_db_get_table(SWIGTYPE_p_sqlite3.getCPtr(db), sql, SWIGTYPE_p_p_p_char.getCPtr(resultp), SWIGTYPE_p_int.getCPtr(nrow), SWIGTYPE_p_int.getCPtr(ncolumn), ref errmsg); return ret; } - public static void switch_core_db_free_table(SWIGTYPE_p_p_char result) { - freeswitchPINVOKE.switch_core_db_free_table(SWIGTYPE_p_p_char.getCPtr(result)); + public static void switch_core_db_free_table(ref string result) { + freeswitchPINVOKE.switch_core_db_free_table(ref result); } public static void switch_core_db_free(string z) { @@ -808,8 +812,8 @@ return ret; } - public static SWIGTYPE_p_real_pcre switch_regex_compile(string pattern, int options, SWIGTYPE_p_p_char errorptr, SWIGTYPE_p_int erroroffset, SWIGTYPE_p_unsigned_char tables) { - IntPtr cPtr = freeswitchPINVOKE.switch_regex_compile(pattern, options, SWIGTYPE_p_p_char.getCPtr(errorptr), SWIGTYPE_p_int.getCPtr(erroroffset), SWIGTYPE_p_unsigned_char.getCPtr(tables)); + public static SWIGTYPE_p_real_pcre switch_regex_compile(string pattern, int options, ref string errorptr, SWIGTYPE_p_int erroroffset, SWIGTYPE_p_unsigned_char tables) { + IntPtr cPtr = freeswitchPINVOKE.switch_regex_compile(pattern, options, ref errorptr, SWIGTYPE_p_int.getCPtr(erroroffset), SWIGTYPE_p_unsigned_char.getCPtr(tables)); SWIGTYPE_p_real_pcre ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_real_pcre(cPtr, false); return ret; } @@ -920,13 +924,13 @@ freeswitchPINVOKE.switch_core_port_allocator_destroy(SWIGTYPE_p_p_switch_core_port_allocator.getCPtr(alloc)); } - public static switch_status_t switch_core_init(uint flags, switch_bool_t console, SWIGTYPE_p_p_char err) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_init(flags, (int)console, SWIGTYPE_p_p_char.getCPtr(err)); + public static switch_status_t switch_core_init(uint flags, switch_bool_t console, ref string err) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_init(flags, (int)console, ref err); return ret; } - public static switch_status_t switch_core_init_and_modload(uint flags, switch_bool_t console, SWIGTYPE_p_p_char err) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_init_and_modload(flags, (int)console, SWIGTYPE_p_p_char.getCPtr(err)); + public static switch_status_t switch_core_init_and_modload(uint flags, switch_bool_t console, ref string err) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_init_and_modload(flags, (int)console, ref err); return ret; } @@ -973,6 +977,10 @@ return ret; } + public static void switch_core_remove_state_handler(switch_state_handler_table state_handler) { + freeswitchPINVOKE.switch_core_remove_state_handler(switch_state_handler_table.getCPtr(state_handler)); + } + public static switch_state_handler_table switch_core_get_state_handler(int index) { IntPtr cPtr = freeswitchPINVOKE.switch_core_get_state_handler(index); switch_state_handler_table ret = (cPtr == IntPtr.Zero) ? null : new switch_state_handler_table(cPtr, false); @@ -1543,8 +1551,8 @@ return ret; } - public static switch_status_t switch_core_file_get_string(switch_file_handle fh, switch_audio_col_t col, SWIGTYPE_p_p_char arg2) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_file_get_string(switch_file_handle.getCPtr(fh), (int)col, SWIGTYPE_p_p_char.getCPtr(arg2)); + public static switch_status_t switch_core_file_get_string(switch_file_handle fh, switch_audio_col_t col, ref string arg2) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_file_get_string(switch_file_handle.getCPtr(fh), (int)col, ref arg2); return ret; } @@ -1609,8 +1617,8 @@ return ret; } - public static switch_status_t switch_core_asr_get_results(switch_asr_handle ah, SWIGTYPE_p_p_char xmlstr, SWIGTYPE_p_unsigned_long flags) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_asr_get_results(switch_asr_handle.getCPtr(ah), SWIGTYPE_p_p_char.getCPtr(xmlstr), SWIGTYPE_p_unsigned_long.getCPtr(flags)); + public static switch_status_t switch_core_asr_get_results(switch_asr_handle ah, ref string xmlstr, SWIGTYPE_p_unsigned_long flags) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_asr_get_results(switch_asr_handle.getCPtr(ah), ref xmlstr, SWIGTYPE_p_unsigned_long.getCPtr(flags)); return ret; } @@ -1649,8 +1657,8 @@ return ret; } - public static switch_status_t switch_core_directory_next_pair(switch_directory_handle dh, SWIGTYPE_p_p_char var, SWIGTYPE_p_p_char val) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_directory_next_pair(switch_directory_handle.getCPtr(dh), SWIGTYPE_p_p_char.getCPtr(var), SWIGTYPE_p_p_char.getCPtr(val)); + public static switch_status_t switch_core_directory_next_pair(switch_directory_handle dh, ref string var, ref string val) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_directory_next_pair(switch_directory_handle.getCPtr(dh), ref var, ref val); return ret; } @@ -1805,8 +1813,8 @@ freeswitchPINVOKE.switch_load_network_lists((int)reload); } - public static switch_bool_t switch_check_network_list_ip_token(string ip_str, string list_name, SWIGTYPE_p_p_char token) { - switch_bool_t ret = (switch_bool_t)freeswitchPINVOKE.switch_check_network_list_ip_token(ip_str, list_name, SWIGTYPE_p_p_char.getCPtr(token)); + public static switch_bool_t switch_check_network_list_ip_token(string ip_str, string list_name, ref string token) { + switch_bool_t ret = (switch_bool_t)freeswitchPINVOKE.switch_check_network_list_ip_token(ip_str, list_name, ref token); return ret; } @@ -1920,6 +1928,11 @@ return ret; } + public static string switch_safe_strdup(string it) { + string ret = freeswitchPINVOKE.switch_safe_strdup(it); + return ret; + } + public static switch_bool_t switch_strstr(string s, string q) { switch_bool_t ret = (switch_bool_t)freeswitchPINVOKE.switch_strstr(s, q); return ret; @@ -1930,8 +1943,8 @@ return ret; } - public static uint switch_separate_string(string buf, char delim, SWIGTYPE_p_p_char array, uint arraylen) { - uint ret = freeswitchPINVOKE.switch_separate_string(buf, delim, SWIGTYPE_p_p_char.getCPtr(array), arraylen); + public static uint switch_separate_string(string buf, char delim, ref string array, uint arraylen) { + uint ret = freeswitchPINVOKE.switch_separate_string(buf, delim, ref array, arraylen); return ret; } @@ -2035,8 +2048,8 @@ return ret; } - public static switch_bool_t switch_network_list_validate_ip_token(SWIGTYPE_p_switch_network_list list, uint ip, SWIGTYPE_p_p_char token) { - switch_bool_t ret = (switch_bool_t)freeswitchPINVOKE.switch_network_list_validate_ip_token(SWIGTYPE_p_switch_network_list.getCPtr(list), ip, SWIGTYPE_p_p_char.getCPtr(token)); + public static switch_bool_t switch_network_list_validate_ip_token(SWIGTYPE_p_switch_network_list list, uint ip, ref string token) { + switch_bool_t ret = (switch_bool_t)freeswitchPINVOKE.switch_network_list_validate_ip_token(SWIGTYPE_p_switch_network_list.getCPtr(list), ip, ref token); return ret; } @@ -2101,8 +2114,8 @@ freeswitchPINVOKE.switch_channel_wait_for_state(SWIGTYPE_p_switch_channel.getCPtr(channel), SWIGTYPE_p_switch_channel.getCPtr(other_channel), (int)want_state); } - public static switch_status_t switch_channel_wait_for_flag(SWIGTYPE_p_switch_channel channel, uint want_flag, switch_bool_t pres, uint to) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_channel_wait_for_flag(SWIGTYPE_p_switch_channel.getCPtr(channel), want_flag, (int)pres, to); + public static switch_status_t switch_channel_wait_for_flag(SWIGTYPE_p_switch_channel channel, uint want_flag, switch_bool_t pres, uint to, SWIGTYPE_p_switch_channel super_channel) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_channel_wait_for_flag(SWIGTYPE_p_switch_channel.getCPtr(channel), want_flag, (int)pres, to, SWIGTYPE_p_switch_channel.getCPtr(super_channel)); return ret; } @@ -2572,8 +2585,8 @@ return ret; } - public static switch_status_t switch_event_serialize(switch_event arg0, SWIGTYPE_p_p_char str, switch_bool_t encode) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_event_serialize(switch_event.getCPtr(arg0), SWIGTYPE_p_p_char.getCPtr(str), (int)encode); + public static switch_status_t switch_event_serialize(switch_event arg0, ref string str, switch_bool_t encode) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_event_serialize(switch_event.getCPtr(arg0), ref str, (int)encode); return ret; } @@ -3124,19 +3137,19 @@ freeswitchPINVOKE.switch_rtp_release_port(ip, port); } - public static switch_status_t switch_rtp_create(SWIGTYPE_p_p_switch_rtp new_rtp_session, byte payload, uint samples_per_interval, uint ms_per_packet, uint flags, string timer_name, SWIGTYPE_p_p_char err, SWIGTYPE_p_apr_pool_t pool) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_rtp_create(SWIGTYPE_p_p_switch_rtp.getCPtr(new_rtp_session), payload, samples_per_interval, ms_per_packet, flags, timer_name, SWIGTYPE_p_p_char.getCPtr(err), SWIGTYPE_p_apr_pool_t.getCPtr(pool)); + public static switch_status_t switch_rtp_create(SWIGTYPE_p_p_switch_rtp new_rtp_session, byte payload, uint samples_per_interval, uint ms_per_packet, uint flags, string timer_name, ref string err, SWIGTYPE_p_apr_pool_t pool) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_rtp_create(SWIGTYPE_p_p_switch_rtp.getCPtr(new_rtp_session), payload, samples_per_interval, ms_per_packet, flags, timer_name, ref err, SWIGTYPE_p_apr_pool_t.getCPtr(pool)); return ret; } - public static SWIGTYPE_p_switch_rtp switch_rtp_new(string rx_host, ushort rx_port, string tx_host, ushort tx_port, byte payload, uint samples_per_interval, uint ms_per_packet, uint flags, string timer_name, SWIGTYPE_p_p_char err, SWIGTYPE_p_apr_pool_t pool) { - IntPtr cPtr = freeswitchPINVOKE.switch_rtp_new(rx_host, rx_port, tx_host, tx_port, payload, samples_per_interval, ms_per_packet, flags, timer_name, SWIGTYPE_p_p_char.getCPtr(err), SWIGTYPE_p_apr_pool_t.getCPtr(pool)); + public static SWIGTYPE_p_switch_rtp switch_rtp_new(string rx_host, ushort rx_port, string tx_host, ushort tx_port, byte payload, uint samples_per_interval, uint ms_per_packet, uint flags, string timer_name, ref string err, SWIGTYPE_p_apr_pool_t pool) { + IntPtr cPtr = freeswitchPINVOKE.switch_rtp_new(rx_host, rx_port, tx_host, tx_port, payload, samples_per_interval, ms_per_packet, flags, timer_name, ref err, SWIGTYPE_p_apr_pool_t.getCPtr(pool)); SWIGTYPE_p_switch_rtp ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_switch_rtp(cPtr, false); return ret; } - public static switch_status_t switch_rtp_set_remote_address(SWIGTYPE_p_switch_rtp rtp_session, string host, ushort port, SWIGTYPE_p_p_char err) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_rtp_set_remote_address(SWIGTYPE_p_switch_rtp.getCPtr(rtp_session), host, port, SWIGTYPE_p_p_char.getCPtr(err)); + public static switch_status_t switch_rtp_set_remote_address(SWIGTYPE_p_switch_rtp rtp_session, string host, ushort port, ref string err) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_rtp_set_remote_address(SWIGTYPE_p_switch_rtp.getCPtr(rtp_session), host, port, ref err); return ret; } @@ -3144,8 +3157,8 @@ freeswitchPINVOKE.switch_rtp_set_max_missed_packets(SWIGTYPE_p_switch_rtp.getCPtr(rtp_session), max); } - public static switch_status_t switch_rtp_set_local_address(SWIGTYPE_p_switch_rtp rtp_session, string host, ushort port, SWIGTYPE_p_p_char err) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_rtp_set_local_address(SWIGTYPE_p_switch_rtp.getCPtr(rtp_session), host, port, SWIGTYPE_p_p_char.getCPtr(err)); + public static switch_status_t switch_rtp_set_local_address(SWIGTYPE_p_switch_rtp rtp_session, string host, ushort port, ref string err) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_rtp_set_local_address(SWIGTYPE_p_switch_rtp.getCPtr(rtp_session), host, port, ref err); return ret; } @@ -3405,12 +3418,6 @@ return ret; } - public static SWIGTYPE_p_p_char switch_xml_pi(switch_xml xml, string target) { - IntPtr cPtr = freeswitchPINVOKE.switch_xml_pi(switch_xml.getCPtr(xml), target); - SWIGTYPE_p_p_char ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_p_char(cPtr, false); - return ret; - } - public static void switch_xml_free(switch_xml xml) { freeswitchPINVOKE.switch_xml_free(switch_xml.getCPtr(xml)); } @@ -3468,14 +3475,14 @@ return ret; } - public static switch_xml switch_xml_open_root(byte reload, SWIGTYPE_p_p_char err) { - IntPtr cPtr = freeswitchPINVOKE.switch_xml_open_root(reload, SWIGTYPE_p_p_char.getCPtr(err)); + public static switch_xml switch_xml_open_root(byte reload, ref string err) { + IntPtr cPtr = freeswitchPINVOKE.switch_xml_open_root(reload, ref err); switch_xml ret = (cPtr == IntPtr.Zero) ? null : new switch_xml(cPtr, false); return ret; } - public static switch_status_t switch_xml_init(SWIGTYPE_p_apr_pool_t pool, SWIGTYPE_p_p_char err) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_xml_init(SWIGTYPE_p_apr_pool_t.getCPtr(pool), SWIGTYPE_p_p_char.getCPtr(err)); + public static switch_status_t switch_xml_init(SWIGTYPE_p_apr_pool_t pool, ref string err) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_xml_init(SWIGTYPE_p_apr_pool_t.getCPtr(pool), ref err); return ret; } @@ -3684,8 +3691,8 @@ freeswitchPINVOKE.switch_config_close_file(switch_config.getCPtr(cfg)); } - public static int switch_config_next_pair(switch_config cfg, SWIGTYPE_p_p_char var, SWIGTYPE_p_p_char val) { - int ret = freeswitchPINVOKE.switch_config_next_pair(switch_config.getCPtr(cfg), SWIGTYPE_p_p_char.getCPtr(var), SWIGTYPE_p_p_char.getCPtr(val)); + public static int switch_config_next_pair(switch_config cfg, ref string var, ref string val) { + int ret = freeswitchPINVOKE.switch_config_next_pair(switch_config.getCPtr(cfg), ref var, ref val); return ret; } @@ -3791,6 +3798,7 @@ public static readonly string SWITCH_BRIDGE_CHANNEL_VARIABLE = freeswitchPINVOKE.SWITCH_BRIDGE_CHANNEL_VARIABLE_get(); public static readonly string SWITCH_CHANNEL_NAME_VARIABLE = freeswitchPINVOKE.SWITCH_CHANNEL_NAME_VARIABLE_get(); public static readonly string SWITCH_BRIDGE_UUID_VARIABLE = freeswitchPINVOKE.SWITCH_BRIDGE_UUID_VARIABLE_get(); + public static readonly string SWITCH_CONTINUE_ON_FAILURE_VARIABLE = freeswitchPINVOKE.SWITCH_CONTINUE_ON_FAILURE_VARIABLE_get(); public static readonly string SWITCH_PLAYBACK_TERMINATORS_VARIABLE = freeswitchPINVOKE.SWITCH_PLAYBACK_TERMINATORS_VARIABLE_get(); public static readonly string SWITCH_CACHE_SPEECH_HANDLES_VARIABLE = freeswitchPINVOKE.SWITCH_CACHE_SPEECH_HANDLES_VARIABLE_get(); public static readonly string SWITCH_CACHE_SPEECH_HANDLES_OBJ_NAME = freeswitchPINVOKE.SWITCH_CACHE_SPEECH_HANDLES_OBJ_NAME_get(); @@ -3882,7 +3890,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -4280,6 +4288,9 @@ [DllImport("mod_mono", EntryPoint="CSharp_SWITCH_BRIDGE_UUID_VARIABLE_get")] public static extern string SWITCH_BRIDGE_UUID_VARIABLE_get(); + [DllImport("mod_mono", EntryPoint="CSharp_SWITCH_CONTINUE_ON_FAILURE_VARIABLE_get")] + public static extern string SWITCH_CONTINUE_ON_FAILURE_VARIABLE_get(); + [DllImport("mod_mono", EntryPoint="CSharp_SWITCH_PLAYBACK_TERMINATORS_VARIABLE_get")] public static extern string SWITCH_PLAYBACK_TERMINATORS_VARIABLE_get(); @@ -4734,13 +4745,13 @@ public static extern string switch_core_db_errmsg(HandleRef jarg1); [DllImport("mod_mono", EntryPoint="CSharp_switch_core_db_exec")] - public static extern int switch_core_db_exec(HandleRef jarg1, string jarg2, HandleRef jarg3, HandleRef jarg4, HandleRef jarg5); + public static extern int switch_core_db_exec(HandleRef jarg1, string jarg2, HandleRef jarg3, HandleRef jarg4, ref string jarg5); [DllImport("mod_mono", EntryPoint="CSharp_switch_core_db_finalize")] public static extern int switch_core_db_finalize(HandleRef jarg1); [DllImport("mod_mono", EntryPoint="CSharp_switch_core_db_prepare")] - public static extern int switch_core_db_prepare(HandleRef jarg1, string jarg2, int jarg3, HandleRef jarg4, HandleRef jarg5); + public static extern int switch_core_db_prepare(HandleRef jarg1, string jarg2, int jarg3, HandleRef jarg4, ref string jarg5); [DllImport("mod_mono", EntryPoint="CSharp_switch_core_db_step")] public static extern int switch_core_db_step(HandleRef jarg1); @@ -4764,10 +4775,10 @@ public static extern long switch_core_db_last_insert_rowid(HandleRef jarg1); [DllImport("mod_mono", EntryPoint="CSharp_switch_core_db_get_table")] - public static extern int switch_core_db_get_table(HandleRef jarg1, string jarg2, HandleRef jarg3, HandleRef jarg4, HandleRef jarg5, HandleRef jarg6); + public static extern int switch_core_db_get_table(HandleRef jarg1, string jarg2, HandleRef jarg3, HandleRef jarg4, HandleRef jarg5, ref string jarg6); [DllImport("mod_mono", EntryPoint="CSharp_switch_core_db_free_table")] - public static extern void switch_core_db_free_table(HandleRef jarg1); + public static extern void switch_core_db_free_table(ref string jarg1); [DllImport("mod_mono", EntryPoint="CSharp_switch_core_db_free")] public static extern void switch_core_db_free(string jarg1); @@ -4866,7 +4877,7 @@ public static extern string switch_mprintf(string jarg1); [DllImport("mod_mono", EntryPoint="CSharp_switch_regex_compile")] - public static extern IntPtr switch_regex_compile(string jarg1, int jarg2, HandleRef jarg3, HandleRef jarg4, HandleRef jarg5); + public static extern IntPtr switch_regex_compile(string jarg1, int jarg2, ref string jarg3, HandleRef jarg4, HandleRef jarg5); [DllImport("mod_mono", EntryPoint="CSharp_switch_regex_copy_substring")] public static extern int switch_regex_copy_substring(string jarg1, HandleRef jarg2, int jarg3, int jarg4, string jarg5, int jarg6); @@ -5130,10 +5141,10 @@ public static extern void switch_core_port_allocator_destroy(HandleRef jarg1); [DllImport("mod_mono", EntryPoint="CSharp_switch_core_init")] - public static extern int switch_core_init(uint jarg1, int jarg2, HandleRef jarg3); + public static extern int switch_core_init(uint jarg1, int jarg2, ref string jarg3); [DllImport("mod_mono", EntryPoint="CSharp_switch_core_init_and_modload")] - public static extern int switch_core_init_and_modload(uint jarg1, int jarg2, HandleRef jarg3); + public static extern int switch_core_init_and_modload(uint jarg1, int jarg2, ref string jarg3); [DllImport("mod_mono", EntryPoint="CSharp_switch_core_session_limit")] public static extern uint switch_core_session_limit(uint jarg1); @@ -5162,6 +5173,9 @@ [DllImport("mod_mono", EntryPoint="CSharp_switch_core_add_state_handler")] public static extern int switch_core_add_state_handler(HandleRef jarg1); + [DllImport("mod_mono", EntryPoint="CSharp_switch_core_remove_state_handler")] + public static extern void switch_core_remove_state_handler(HandleRef jarg1); + [DllImport("mod_mono", EntryPoint="CSharp_switch_core_get_state_handler")] public static extern IntPtr switch_core_get_state_handler(int jarg1); @@ -5502,7 +5516,7 @@ public static extern int switch_core_file_set_string(HandleRef jarg1, int jarg2, string jarg3); [DllImport("mod_mono", EntryPoint="CSharp_switch_core_file_get_string")] - public static extern int switch_core_file_get_string(HandleRef jarg1, int jarg2, HandleRef jarg3); + public static extern int switch_core_file_get_string(HandleRef jarg1, int jarg2, ref string jarg3); [DllImport("mod_mono", EntryPoint="CSharp_switch_core_file_close")] public static extern int switch_core_file_close(HandleRef jarg1); @@ -5544,7 +5558,7 @@ public static extern int switch_core_asr_check_results(HandleRef jarg1, HandleRef jarg2); [DllImport("mod_mono", EntryPoint="CSharp_switch_core_asr_get_results")] - public static extern int switch_core_asr_get_results(HandleRef jarg1, HandleRef jarg2, HandleRef jarg3); + public static extern int switch_core_asr_get_results(HandleRef jarg1, ref string jarg2, HandleRef jarg3); [DllImport("mod_mono", EntryPoint="CSharp_switch_core_asr_load_grammar")] public static extern int switch_core_asr_load_grammar(HandleRef jarg1, string jarg2, string jarg3); @@ -5568,7 +5582,7 @@ public static extern int switch_core_directory_next(HandleRef jarg1); [DllImport("mod_mono", EntryPoint="CSharp_switch_core_directory_next_pair")] - public static extern int switch_core_directory_next_pair(HandleRef jarg1, HandleRef jarg2, HandleRef jarg3); + public static extern int switch_core_directory_next_pair(HandleRef jarg1, ref string jarg2, ref string jarg3); [DllImport("mod_mono", EntryPoint="CSharp_switch_core_directory_close")] public static extern int switch_core_directory_close(HandleRef jarg1); @@ -5664,7 +5678,7 @@ public static extern void switch_load_network_lists(int jarg1); [DllImport("mod_mono", EntryPoint="CSharp_switch_check_network_list_ip_token")] - public static extern int switch_check_network_list_ip_token(string jarg1, string jarg2, HandleRef jarg3); + public static extern int switch_check_network_list_ip_token(string jarg1, string jarg2, ref string jarg3); [DllImport("mod_mono", EntryPoint="CSharp_switch_time_set_monotonic")] public static extern void switch_time_set_monotonic(int jarg1); @@ -5738,6 +5752,9 @@ [DllImport("mod_mono", EntryPoint="CSharp_switch_clean_string")] public static extern string switch_clean_string(string jarg1); + [DllImport("mod_mono", EntryPoint="CSharp_switch_safe_strdup")] + public static extern string switch_safe_strdup(string jarg1); + [DllImport("mod_mono", EntryPoint="CSharp_switch_strstr")] public static extern int switch_strstr(string jarg1, string jarg2); @@ -5745,7 +5762,7 @@ public static extern IntPtr switch_str_time(string jarg1); [DllImport("mod_mono", EntryPoint="CSharp_switch_separate_string")] - public static extern uint switch_separate_string(string jarg1, char jarg2, HandleRef jarg3, uint jarg4); + public static extern uint switch_separate_string(string jarg1, char jarg2, ref string jarg3, uint jarg4); [DllImport("mod_mono", EntryPoint="CSharp_switch_is_number")] public static extern int switch_is_number(string jarg1); @@ -5808,7 +5825,7 @@ public static extern int switch_network_list_add_host_mask(HandleRef jarg1, string jarg2, string jarg3, int jarg4); [DllImport("mod_mono", EntryPoint="CSharp_switch_network_list_validate_ip_token")] - public static extern int switch_network_list_validate_ip_token(HandleRef jarg1, uint jarg2, HandleRef jarg3); + public static extern int switch_network_list_validate_ip_token(HandleRef jarg1, uint jarg2, ref string jarg3); [DllImport("mod_mono", EntryPoint="CSharp_switch_caller_profile_username_set")] public static extern void switch_caller_profile_username_set(HandleRef jarg1, string jarg2); @@ -6639,10 +6656,10 @@ public static extern IntPtr switch_file_interface_file_get_string_get(HandleRef jarg1); [DllImport("mod_mono", EntryPoint="CSharp_switch_file_interface_extens_set")] - public static extern void switch_file_interface_extens_set(HandleRef jarg1, HandleRef jarg2); + public static extern void switch_file_interface_extens_set(HandleRef jarg1, ref string jarg2); [DllImport("mod_mono", EntryPoint="CSharp_switch_file_interface_extens_get")] - public static extern IntPtr switch_file_interface_extens_get(HandleRef jarg1); + public static extern string switch_file_interface_extens_get(HandleRef jarg1); [DllImport("mod_mono", EntryPoint="CSharp_switch_file_interface_rwlock_set")] public static extern void switch_file_interface_rwlock_set(HandleRef jarg1, HandleRef jarg2); @@ -7803,7 +7820,7 @@ public static extern void switch_channel_wait_for_state(HandleRef jarg1, HandleRef jarg2, int jarg3); [DllImport("mod_mono", EntryPoint="CSharp_switch_channel_wait_for_flag")] - public static extern int switch_channel_wait_for_flag(HandleRef jarg1, uint jarg2, int jarg3, uint jarg4); + public static extern int switch_channel_wait_for_flag(HandleRef jarg1, uint jarg2, int jarg3, uint jarg4, HandleRef jarg5); [DllImport("mod_mono", EntryPoint="CSharp_switch_channel_perform_set_state")] public static extern int switch_channel_perform_set_state(HandleRef jarg1, string jarg2, string jarg3, int jarg4, int jarg5); @@ -8184,7 +8201,7 @@ public static extern int switch_event_free_subclass_detailed(string jarg1, string jarg2); [DllImport("mod_mono", EntryPoint="CSharp_switch_event_serialize")] - public static extern int switch_event_serialize(HandleRef jarg1, HandleRef jarg2, int jarg3); + public static extern int switch_event_serialize(HandleRef jarg1, ref string jarg2, int jarg3); [DllImport("mod_mono", EntryPoint="CSharp_switch_event_running")] public static extern int switch_event_running(); @@ -8742,19 +8759,19 @@ public static extern void switch_rtp_release_port(string jarg1, ushort jarg2); [DllImport("mod_mono", EntryPoint="CSharp_switch_rtp_create")] - public static extern int switch_rtp_create(HandleRef jarg1, byte jarg2, uint jarg3, uint jarg4, uint jarg5, string jarg6, HandleRef jarg7, HandleRef jarg8); + public static extern int switch_rtp_create(HandleRef jarg1, byte jarg2, uint jarg3, uint jarg4, uint jarg5, string jarg6, ref string jarg7, HandleRef jarg8); [DllImport("mod_mono", EntryPoint="CSharp_switch_rtp_new")] - public static extern IntPtr switch_rtp_new(string jarg1, ushort jarg2, string jarg3, ushort jarg4, byte jarg5, uint jarg6, uint jarg7, uint jarg8, string jarg9, HandleRef jarg10, HandleRef jarg11); + public static extern IntPtr switch_rtp_new(string jarg1, ushort jarg2, string jarg3, ushort jarg4, byte jarg5, uint jarg6, uint jarg7, uint jarg8, string jarg9, ref string jarg10, HandleRef jarg11); [DllImport("mod_mono", EntryPoint="CSharp_switch_rtp_set_remote_address")] - public static extern int switch_rtp_set_remote_address(HandleRef jarg1, string jarg2, ushort jarg3, HandleRef jarg4); + public static extern int switch_rtp_set_remote_address(HandleRef jarg1, string jarg2, ushort jarg3, ref string jarg4); [DllImport("mod_mono", EntryPoint="CSharp_switch_rtp_set_max_missed_packets")] public static extern void switch_rtp_set_max_missed_packets(HandleRef jarg1, uint jarg2); [DllImport("mod_mono", EntryPoint="CSharp_switch_rtp_set_local_address")] - public static extern int switch_rtp_set_local_address(HandleRef jarg1, string jarg2, ushort jarg3, HandleRef jarg4); + public static extern int switch_rtp_set_local_address(HandleRef jarg1, string jarg2, ushort jarg3, ref string jarg4); [DllImport("mod_mono", EntryPoint="CSharp_switch_rtp_kill_socket")] public static extern void switch_rtp_kill_socket(HandleRef jarg1); @@ -8937,10 +8954,10 @@ public static extern string switch_xml_name_get(HandleRef jarg1); [DllImport("mod_mono", EntryPoint="CSharp_switch_xml_attr_set")] - public static extern void switch_xml_attr_set(HandleRef jarg1, HandleRef jarg2); + public static extern void switch_xml_attr_set(HandleRef jarg1, ref string jarg2); [DllImport("mod_mono", EntryPoint="CSharp_switch_xml_attr_get")] - public static extern IntPtr switch_xml_attr_get(HandleRef jarg1); + public static extern string switch_xml_attr_get(HandleRef jarg1); [DllImport("mod_mono", EntryPoint="CSharp_switch_xml_txt_set")] public static extern void switch_xml_txt_set(HandleRef jarg1, string jarg2); @@ -9038,9 +9055,6 @@ [DllImport("mod_mono", EntryPoint="CSharp_switch_xml_toxml_buf")] public static extern string switch_xml_toxml_buf(HandleRef jarg1, string jarg2, HandleRef jarg3, HandleRef jarg4, int jarg5); - [DllImport("mod_mono", EntryPoint="CSharp_switch_xml_pi")] - public static extern IntPtr switch_xml_pi(HandleRef jarg1, string jarg2); - [DllImport("mod_mono", EntryPoint="CSharp_switch_xml_free")] public static extern void switch_xml_free(HandleRef jarg1); @@ -9072,10 +9086,10 @@ public static extern IntPtr switch_xml_insert(HandleRef jarg1, HandleRef jarg2, HandleRef jarg3); [DllImport("mod_mono", EntryPoint="CSharp_switch_xml_open_root")] - public static extern IntPtr switch_xml_open_root(byte jarg1, HandleRef jarg2); + public static extern IntPtr switch_xml_open_root(byte jarg1, ref string jarg2); [DllImport("mod_mono", EntryPoint="CSharp_switch_xml_init")] - public static extern int switch_xml_init(HandleRef jarg1, HandleRef jarg2); + public static extern int switch_xml_init(HandleRef jarg1, ref string jarg2); [DllImport("mod_mono", EntryPoint="CSharp_switch_xml_destroy")] public static extern int switch_xml_destroy(); @@ -9597,7 +9611,7 @@ public static extern void switch_config_close_file(HandleRef jarg1); [DllImport("mod_mono", EntryPoint="CSharp_switch_config_next_pair")] - public static extern int switch_config_next_pair(HandleRef jarg1, HandleRef jarg2, HandleRef jarg3); + public static extern int switch_config_next_pair(HandleRef jarg1, ref string jarg2, ref string jarg3); [DllImport("mod_mono", EntryPoint="CSharp_consoleLog")] public static extern void consoleLog(string jarg1, string jarg2); @@ -9884,6 +9898,9 @@ [DllImport("mod_mono", EntryPoint="CSharp_CoreSession_Originate")] public static extern int CoreSession_Originate(HandleRef jarg1, HandleRef jarg2, string jarg3, int jarg4); + [DllImport("mod_mono", EntryPoint="CSharp_CoreSession_destroy")] + public static extern void CoreSession_destroy(HandleRef jarg1); + [DllImport("mod_mono", EntryPoint="CSharp_CoreSession_Speak")] public static extern int CoreSession_Speak(HandleRef jarg1, string jarg2); @@ -9996,7 +10013,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -10086,7 +10103,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -10141,7 +10158,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -10193,7 +10210,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -10210,7 +10227,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -10269,7 +10286,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -10299,7 +10316,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -10329,7 +10346,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -10359,7 +10376,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -10389,7 +10406,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -10419,7 +10436,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -10449,7 +10466,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -10479,7 +10496,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -10509,7 +10526,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -10539,7 +10556,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -10569,7 +10586,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -10599,7 +10616,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -10629,7 +10646,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -10659,7 +10676,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -10689,7 +10706,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -10719,7 +10736,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -10749,7 +10766,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -10779,7 +10796,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -10809,7 +10826,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -10839,7 +10856,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -10869,7 +10886,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -10899,7 +10916,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -10929,7 +10946,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -10959,7 +10976,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -10989,7 +11006,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11019,7 +11036,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11049,7 +11066,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11079,7 +11096,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11109,7 +11126,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11139,7 +11156,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11169,7 +11186,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11199,7 +11216,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11229,7 +11246,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11259,7 +11276,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11289,7 +11306,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11319,7 +11336,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11349,7 +11366,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11379,7 +11396,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11409,7 +11426,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11439,7 +11456,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11469,7 +11486,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11499,7 +11516,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11529,7 +11546,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11559,7 +11576,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11589,7 +11606,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11619,7 +11636,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11649,7 +11666,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11679,7 +11696,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11709,7 +11726,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11739,7 +11756,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11769,7 +11786,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11799,7 +11816,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11829,7 +11846,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11859,7 +11876,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11889,7 +11906,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11919,7 +11936,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11949,7 +11966,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -11979,7 +11996,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12009,7 +12026,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12039,7 +12056,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12069,7 +12086,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12099,7 +12116,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12129,7 +12146,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12159,7 +12176,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12189,7 +12206,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12219,7 +12236,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12249,7 +12266,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12279,7 +12296,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12309,7 +12326,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12339,7 +12356,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12369,7 +12386,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12399,7 +12416,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12429,7 +12446,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12459,7 +12476,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12489,7 +12506,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12519,7 +12536,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12549,7 +12566,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12579,7 +12596,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12609,7 +12626,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12639,7 +12656,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12669,7 +12686,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12699,7 +12716,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12729,7 +12746,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12759,7 +12776,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12789,7 +12806,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12819,7 +12836,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12849,7 +12866,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12879,7 +12896,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12909,7 +12926,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12939,7 +12956,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12969,7 +12986,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -12999,7 +13016,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13029,7 +13046,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13059,7 +13076,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13089,7 +13106,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13119,7 +13136,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13149,7 +13166,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13179,7 +13196,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13209,7 +13226,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13239,7 +13256,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13269,7 +13286,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13299,7 +13316,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13329,7 +13346,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13359,7 +13376,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13389,7 +13406,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13419,7 +13436,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13449,7 +13466,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13479,7 +13496,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13509,7 +13526,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13539,7 +13556,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13569,7 +13586,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13599,7 +13616,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13629,7 +13646,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13659,7 +13676,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13689,7 +13706,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13719,7 +13736,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13749,7 +13766,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13779,7 +13796,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13809,7 +13826,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13839,7 +13856,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13869,7 +13886,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13899,7 +13916,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13929,7 +13946,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13959,7 +13976,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -13989,7 +14006,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -14019,7 +14036,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -14049,7 +14066,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -14079,7 +14096,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -14109,7 +14126,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -14139,7 +14156,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -14169,7 +14186,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -14199,7 +14216,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -14229,7 +14246,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -14259,7 +14276,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -14289,7 +14306,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -14310,7 +14327,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -14420,7 +14437,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -14436,7 +14453,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -14566,7 +14583,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -14644,7 +14661,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -14664,7 +14681,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -14804,7 +14821,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -14982,7 +14999,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -15002,7 +15019,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -15164,7 +15181,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -15184,7 +15201,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -15200,7 +15217,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -15379,7 +15396,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -15395,7 +15412,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -15484,7 +15501,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -15606,7 +15623,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -15949,7 +15966,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -15966,7 +15983,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -16043,7 +16060,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -16087,7 +16104,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -16114,7 +16131,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -16256,7 +16273,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -16346,7 +16363,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -16488,7 +16505,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -16510,7 +16527,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -16762,7 +16779,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -16862,7 +16879,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -17069,7 +17086,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -17087,7 +17104,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -17225,7 +17242,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -17245,7 +17262,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -17432,7 +17449,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -17447,7 +17464,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -17481,7 +17498,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -17582,7 +17599,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -17699,7 +17716,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -17789,7 +17806,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -17936,7 +17953,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -17951,7 +17968,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -18041,7 +18058,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -18175,7 +18192,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -18191,7 +18208,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -18258,7 +18275,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -18275,7 +18292,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -18387,7 +18404,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -18549,7 +18566,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -18627,7 +18644,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -18694,7 +18711,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -18721,7 +18738,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -19101,7 +19118,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -19227,15 +19244,13 @@ } } - public SWIGTYPE_p_p_char extens { - set { - freeswitchPINVOKE.switch_file_interface_extens_set(swigCPtr, SWIGTYPE_p_p_char.getCPtr(value)); - } - get { - IntPtr cPtr = freeswitchPINVOKE.switch_file_interface_extens_get(swigCPtr); - SWIGTYPE_p_p_char ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_p_char(cPtr, false); - return ret; - } + public string extens { + set { freeswitchPINVOKE.switch_file_interface_extens_set(swigCPtr, ref value); } + + get { + return freeswitchPINVOKE.switch_file_interface_extens_get(swigCPtr); + } + } public SWIGTYPE_p_switch_thread_rwlock_t rwlock { @@ -19268,7 +19283,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -19470,7 +19485,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -19491,7 +19506,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -19592,7 +19607,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -19608,7 +19623,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -19787,7 +19802,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -19856,7 +19871,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -19925,7 +19940,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -19994,7 +20009,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -20063,7 +20078,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -20132,7 +20147,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -20201,7 +20216,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -20270,7 +20285,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -20339,7 +20354,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -20408,7 +20423,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -20477,7 +20492,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -20546,7 +20561,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -20615,7 +20630,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -20631,7 +20646,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -20810,7 +20825,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -20835,7 +20850,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -20856,7 +20871,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -20873,7 +20888,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -20890,7 +20905,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -20980,7 +20995,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -21003,7 +21018,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -21132,7 +21147,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -21149,7 +21164,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -21239,7 +21254,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -21262,7 +21277,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -21283,7 +21298,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -21310,7 +21325,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -21329,7 +21344,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -21346,7 +21361,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -21363,7 +21378,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -21380,7 +21395,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -21481,7 +21496,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -21499,7 +21514,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -21533,7 +21548,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -21670,7 +21685,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -21760,7 +21775,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -21778,7 +21793,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -21810,7 +21825,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -21828,7 +21843,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -21936,7 +21951,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -21962,7 +21977,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -21980,7 +21995,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -22000,7 +22015,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -22160,7 +22175,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -22327,7 +22342,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -22343,7 +22358,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -22367,7 +22382,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -22535,7 +22550,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -22567,7 +22582,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -22717,7 +22732,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -22734,7 +22749,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -22878,7 +22893,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -22893,7 +22908,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -22913,7 +22928,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -23058,7 +23073,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -23273,7 +23288,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -23291,7 +23306,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -23308,7 +23323,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -23326,7 +23341,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -23375,15 +23390,13 @@ } } - public SWIGTYPE_p_p_char attr { - set { - freeswitchPINVOKE.switch_xml_attr_set(swigCPtr, SWIGTYPE_p_p_char.getCPtr(value)); - } - get { - IntPtr cPtr = freeswitchPINVOKE.switch_xml_attr_get(swigCPtr); - SWIGTYPE_p_p_char ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_p_char(cPtr, false); - return ret; - } + public string attr { + set { freeswitchPINVOKE.switch_xml_attr_set(swigCPtr, ref value); } + + get { + return freeswitchPINVOKE.switch_xml_attr_get(swigCPtr); + } + } public string txt { @@ -23491,7 +23504,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -23509,7 +23522,7 @@ } /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.36 + * Version 1.3.35 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead.

1 0

[commit] r9579 - freeswitch/trunk/debian
by Freeswitch SVN 17 Sep '08

17 Sep '08

Author: ctrix Date: Wed Sep 17 17:46:42 2008 New Revision: 9579 Removed: freeswitch/trunk/debian/files Modified: freeswitch/trunk/debian/control freeswitch/trunk/debian/freeswitch.conffiles freeswitch/trunk/debian/freeswitch.install freeswitch/trunk/debian/rules Log: Removing "files" which is generated by the build system. Adding mod_timezone (and it's config file) Adding mod_fax (and it's config file and it's dependencies) Adding freeswitch-dbg package, containing debugging symbols (thanks to nosaj_) Modified: freeswitch/trunk/debian/control ============================================================================== --- freeswitch/trunk/debian/control (original) +++ freeswitch/trunk/debian/control Wed Sep 17 17:46:42 2008 @@ -2,12 +2,12 @@ Maintainer: Michal Bielicki <michal.bielicki(a)voiceworks.pl> Section: net Priority: extra -Build-Depends: debhelper (>= 5), fakeroot, automake1.9, autoconf, libtool, unixodbc-dev, libasound2-dev, libcurl3-openssl-dev|libcurl4-openssl-dev, libssl-dev, ncurses-dev, libogg-dev, libvorbis-dev, libperl-dev, libgdbm-dev, libdb-dev, libgnutls-dev +Build-Depends: debhelper (>= 5), fakeroot, automake1.9, autoconf, libtool, unixodbc-dev, libasound2-dev, libcurl3-openssl-dev|libcurl4-openssl-dev, libssl-dev, ncurses-dev, libogg-dev, libvorbis-dev, libperl-dev, libgdbm-dev, libdb-dev, libgnutls-dev, libtiff4-dev Standards-Version: 3.7.3 Package: freeswitch Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, unixodbc, libasound2, libcurl3, openssl, libncurses5 +Depends: ${shlibs:Depends}, ${misc:Depends}, unixodbc, libasound2, libcurl3, openssl, libncurses5, libvorbis0a Recommends: freeswitch-lang-en Suggests: freeswitch-spidermonkey, freeswitch-lua, freeswitch-perl, freeswitch-sounds-music-8000, monit Description: The FreeSWITCH open source telephony platform @@ -17,6 +17,18 @@ or a media server to host IVR applications using simple scripts or XML to control the callflow. +Package: freeswitch-dbg +Section: devel +Architecture: any +Depends: freeswitch (= ${Source-Version}) +Description: The FreeSWITCH open source telephony platform with Debug symbols + FreeSWITCH is an open source telephony platform designed to facilitate the + creation of voice and chat driven products scaling from a soft-phone up to + a soft-switch. It can be used as a simple switching engine, a media gateway + or a media server to host IVR applications using simple scripts or XML to + control the callflow. + + Package: freeswitch-dev Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch Modified: freeswitch/trunk/debian/freeswitch.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch.conffiles (original) +++ freeswitch/trunk/debian/freeswitch.conffiles Wed Sep 17 17:46:42 2008 @@ -69,6 +69,8 @@ /opt/freeswitch/conf/autoload_configs/cdr_csv.conf.xml /opt/freeswitch/conf/autoload_configs/dialplan_directory.conf.xml /opt/freeswitch/conf/autoload_configs/console.conf.xml +/opt/freeswitch/conf/autoload_configs/timezones.conf.xml +/opt/freeswitch/conf/autoload_configs/fax.conf.xml /opt/freeswitch/conf/jingle_profiles/server.xml /opt/freeswitch/conf/jingle_profiles/client.xml /opt/freeswitch/conf/mrcp_profiles/openmrcp-v2.xml Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Wed Sep 17 17:46:42 2008 @@ -37,6 +37,8 @@ opt/freeswitch/mod/mod_xml_*.so* opt/freeswitch/mod/mod_fsv.so* opt/freeswitch/mod/mod_tone_stream.so* +opt/freeswitch/mod/mod_fax.so* +opt/freeswitch/mod/mod_timezone.so* opt/freeswitch/conf/vars.xml opt/freeswitch/conf/mime.types opt/freeswitch/conf/web-vm.tpl @@ -108,6 +110,8 @@ opt/freeswitch/conf/autoload_configs/cdr_csv.conf.xml opt/freeswitch/conf/autoload_configs/dialplan_directory.conf.xml opt/freeswitch/conf/autoload_configs/console.conf.xml +opt/freeswitch/conf/autoload_configs/timezones.conf.xml +opt/freeswitch/conf/autoload_configs/fax.conf.xml opt/freeswitch/conf/jingle_profiles/server.xml opt/freeswitch/conf/jingle_profiles/client.xml opt/freeswitch/conf/mrcp_profiles/openmrcp-v2.xml Modified: freeswitch/trunk/debian/rules ============================================================================== --- freeswitch/trunk/debian/rules (original) +++ freeswitch/trunk/debian/rules Wed Sep 17 17:46:42 2008 @@ -8,21 +8,28 @@ export DH_COMPAT=4 export DEB_DH_INSTALL_SOURCEDIR=debian/tmp export PASSTHRU_CODEC_MODULES=codecs/mod_g729 codecs/mod_g723_1 codecs/mod_amr -export SPIDERMONKEY_MODULES=languages/mod_spidermonkey languages/mod_spidermonkey_core_db languages/mod_spidermonkey_odbc languages/mod_spidermonkey_socket languages/mod_spidermonkey_teletone -export 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 applications/mod_fsv +export SPIDERMONKEY_MODULES=languages/mod_spidermonkey languages/mod_spidermonkey_core_db languages/mod_spidermonkey_odbc \ + languages/mod_spidermonkey_socket languages/mod_spidermonkey_teletone +export 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 applications/mod_fsv \ + applications/mod_timezone applications/mod_fax export ASR_TTS_MODULES=asr_tts/mod_openmrcp export CODECS_MODULES=codecs/mod_ilbc codecs/mod_h26x codecs/mod_speex codecs/mod_voipcodecs export DIALPLANS_MODULES=dialplans/mod_dialplan_asterisk dialplans/mod_dialplan_directory dialplans/mod_dialplan_xml export DIRECTORIES_MODULES= export DOTNET_MODULES= -export ENDPOINTS_MODULES=endpoints/mod_dingaling endpoints/mod_iax endpoints/mod_portaudio endpoints/mod_sofia endpoints/mod_woomera ../../libs/openzap/mod_openzap +export ENDPOINTS_MODULES=endpoints/mod_dingaling endpoints/mod_iax endpoints/mod_portaudio endpoints/mod_sofia \ + endpoints/mod_woomera ../../libs/openzap/mod_openzap export EVENT_HANDLERS_MODULES=event_handlers/mod_event_multicast event_handlers/mod_event_socket event_handlers/mod_cdr_csv export FORMATS_MODULES=formats/mod_local_stream formats/mod_native_file formats/mod_sndfile formats/mod_tone_stream formats/mod_shout export LANGUAGES_MODULES=languages/mod_perl languages/mod_lua export LOGGERS_MODULES=loggers/mod_console loggers/mod_logfile loggers/mod_syslog export SAY_MODULES=say/mod_say_en say/mod_say_it say/mod_say_de say/mod_say_fr say/mod_say_es say/mod_say_nl export TIMERS_MODULES= -export DISABLED_MODULES=applications/mod_soundtouch 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 +export DISABLED_MODULES=applications/mod_soundtouch 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 export XML_INT_MODULES=xml_int/mod_xml_rpc xml_int/mod_xml_curl xml_int/mod_xml_cdr export 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) export MODULES=$(MYMODULES) @@ -40,6 +47,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +CFLAGS = -ggdb FEATURES = --enable-core-libedit-support --enable-core-odbc-support --with-libcurl --with-openssl @@ -125,7 +133,8 @@ # dh_installman cp debian/monit/freeswitch.monitrc debian/freeswitch/etc/monit/freeswitch.monitrc dh_install --sourcedir=debian/tmp - dh_strip + dh_link + dh_strip --dbg-package=freeswitch dh_compress dh_fixperms --exclude /opt/freeswitch/conf # dh_perl

1 0

[commit] r9578 - freeswitch/trunk/src/mod/endpoints/mod_unicall
by Freeswitch SVN 17 Sep '08

17 Sep '08

Author: coppice Date: Wed Sep 17 12:33:43 2008 New Revision: 9578 Added: freeswitch/trunk/src/mod/endpoints/mod_unicall/ freeswitch/trunk/src/mod/endpoints/mod_unicall/mod_unicall.c Log: Check in of a very incomplete mod_unicall, in the hope of getting some buy in while I'm too buy with other stuff. :-\ Added: freeswitch/trunk/src/mod/endpoints/mod_unicall/mod_unicall.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/endpoints/mod_unicall/mod_unicall.c Wed Sep 17 12:33:43 2008 @@ -0,0 +1,1953 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2008, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Anthony Minessale II <anthmct(a)yahoo.com> + * Steve Underwood 0.0.1 <steveu(a)coppice.org> + * + * + * mod_unicall.c -- UniCall endpoint module + * + */ + +/* This is a work in progress. Unfinished. Non-functional */ + +#include <switch.h> +#include <unicall.h> + +SWITCH_MODULE_LOAD_FUNCTION(mod_unicall_load); +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_unicall_shutdown); +//SWITCH_MODULE_RUNTIME_FUNCTION(mod_unicall_runtime); +SWITCH_MODULE_DEFINITION(mod_unicall, mod_unicall_load, mod_unicall_shutdown, NULL); //mod_unicall_runtime); + +#define MAX_SPANS 128 + +switch_endpoint_interface_t *unicall_endpoint_interface; +static switch_memory_pool_t *module_pool = NULL; +static volatile int running = 1; + +typedef struct +{ + int span; + const char *id; + const char *protocol_class; + const char *protocol_variant; + int protocol_end; + int outgoing_ok; + char *dialplan; + int fd; + uc_t *uc; +} span_data_t; + +span_data_t *span_data[MAX_SPANS]; + +typedef enum { + TFLAG_IO = (1 << 0), + TFLAG_INBOUND = (1 << 1), + TFLAG_OUTBOUND = (1 << 2), + TFLAG_DTMF = (1 << 3), + TFLAG_VOICE = (1 << 4), + TFLAG_HANGUP = (1 << 5), + TFLAG_LINEAR = (1 << 6), + TFLAG_CODEC = (1 << 7), + TFLAG_BREAK = (1 << 8) +} TFLAGS; + +typedef enum { + GFLAG_MY_CODEC_PREFS = (1 << 0) +} GFLAGS; + + +static struct +{ + int debug; + /*! Requested frame duration, in ms */ + uint32_t frame_duration; + int dtmf_on; + int dtmf_off; + int suppress_dtmf_tone; + int ignore_dtmf_tone; + char *dialplan; + char *codec_string; + char *codec_order[SWITCH_MAX_CODECS]; + int codec_order_last; + char *codec_rates_string; + char *codec_rates[SWITCH_MAX_CODECS]; + int codec_rates_last; + unsigned int flags; + int calls; + int configured_spans; + switch_hash_t *call_hash; + switch_mutex_t *mutex; + switch_mutex_t *hash_mutex; + switch_mutex_t *channel_mutex; +} globals; + +typedef struct +{ + unsigned int flags; + switch_codec_t read_codec; + switch_codec_t write_codec; + switch_frame_t read_frame; + uint8_t databuf[SWITCH_RECOMMENDED_BUFFER_SIZE]; + switch_core_session_t *session; + switch_caller_profile_t *caller_profile; + switch_mutex_t *mutex; + switch_mutex_t *flag_mutex; + //switch_thread_cond_t *cond; + uc_t *uc; +} private_t; + + +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dialplan, globals.dialplan); + + + +static switch_status_t unicall_on_init(switch_core_session_t *session); +static switch_status_t unicall_on_routing(switch_core_session_t *session); +static switch_status_t unicall_on_execute(switch_core_session_t *session); +static switch_status_t unicall_on_hangup(switch_core_session_t *session); +static switch_status_t unicall_on_exchange_media(switch_core_session_t *session); +static switch_status_t unicall_on_soft_execute(switch_core_session_t *session); + +static switch_call_cause_t unicall_outgoing_channel(switch_core_session_t *session, + switch_event_t *var_event, + switch_caller_profile_t *outbound_profile, + switch_core_session_t **new_session, + switch_memory_pool_t **pool, + switch_originate_flag_t flags); +static switch_status_t unicall_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id); +static switch_status_t unicall_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id); +static switch_status_t unicall_kill_channel(switch_core_session_t *session, int sig); +static switch_status_t unicall_send_dtmf(switch_core_session_t *session, const switch_dtmf_t *dtmf); +static switch_status_t unicall_receive_message(switch_core_session_t *session, switch_core_session_message_t *msg); +static switch_status_t unicall_receive_event(switch_core_session_t *session, switch_event_t *event); + +#if 0 +static switch_call_cause_t unicall_incoming_channel(zap_sigmsg_t *sigmsg, switch_core_session_t **sp) +{ + switch_core_session_t *session = NULL; + private_t *tech_pvt = NULL; + switch_channel_t *channel = NULL; + char name[128]; + + *sp = NULL; + + if (!(session = switch_core_session_request(openzap_endpoint_interface, NULL))) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Initilization Error!\n"); + return ZAP_FAIL; + } + + switch_core_session_add_stream(session, NULL); + + tech_pvt = (private_t *) switch_core_session_alloc(session, sizeof(private_t)); + assert(tech_pvt != NULL); + channel = switch_core_session_get_channel(session); + if (tech_init(tech_pvt, session, sigmsg->channel) != SWITCH_STATUS_SUCCESS) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Initilization Error!\n"); + switch_core_session_destroy(&session); + return ZAP_FAIL; + } + + *sigmsg->channel->caller_data.collected = '\0'; + + if (switch_strlen_zero(sigmsg->channel->caller_data.cid_name)) + { + switch_set_string(sigmsg->channel->caller_data.cid_name, sigmsg->channel->chan_name); + } + + if (switch_strlen_zero(sigmsg->channel->caller_data.cid_num.digits)) + { + if (!switch_strlen_zero(sigmsg->channel->caller_data.ani.digits)) + { + switch_set_string(sigmsg->channel->caller_data.cid_num.digits, sigmsg->channel->caller_data.ani.digits); + } + else + { + switch_set_string(sigmsg->channel->caller_data.cid_num.digits, sigmsg->channel->chan_number); + } + } + + tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), + "UniCall", + SPAN_CONFIG[sigmsg->channel->span_id].dialplan, + sigmsg->channel->caller_data.cid_name, + sigmsg->channel->caller_data.cid_num.digits, + NULL, + sigmsg->channel->caller_data.ani.digits, + sigmsg->channel->caller_data.aniII, + sigmsg->channel->caller_data.rdnis.digits, + (char *) modname, + SPAN_CONFIG[sigmsg->channel->span_id].context, + sigmsg->channel->caller_data.dnis.digits); + + assert(tech_pvt->caller_profile != NULL); + + if (sigmsg->channel->caller_data.screen == 1 || sigmsg->channel->caller_data.screen == 3) + { + switch_set_flag(tech_pvt->caller_profile, SWITCH_CPF_SCREEN); + } + + if (sigmsg->channel->caller_data.pres) + { + switch_set_flag(tech_pvt->caller_profile, SWITCH_CPF_HIDE_NAME | SWITCH_CPF_HIDE_NUMBER); + } + + snprintf(name, sizeof(name), "UNICALL/%u:%u/%s", sigmsg->channel->span_id, sigmsg->channel->chan_id, tech_pvt->caller_profile->destination_number); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connect inbound channel %s\n", name); + switch_channel_set_name(channel, name); + switch_channel_set_caller_profile(channel, tech_pvt->caller_profile); + + switch_channel_set_state(channel, CS_INIT); + 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_session_destroy(&session); + return ZAP_FAIL; + } + + if (zap_channel_add_token(sigmsg->channel, switch_core_session_get_uuid(session), 0) != ZAP_SUCCESS) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error adding token\n"); + switch_core_session_destroy(&session); + return ZAP_FAIL; + } + *sp = session; + + return ZAP_SUCCESS; +} +#endif + +static void on_devicefail(uc_t *uc, switch_core_session_t *session, uc_event_t *e) +{ + //switch_channel_t *channel; + //private_t *tech_pvt; + + //tech_pvt = switch_core_session_get_private(session); + //assert(tech_pvt != NULL); + //channel = switch_core_session_get_channel(session); + //assert(channel != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "on_devicefail\n"); +} + +static void on_protocolfail(uc_t *uc, switch_core_session_t *session, uc_event_t *e) +{ + //switch_channel_t *channel; + //private_t *tech_pvt; + + //tech_pvt = switch_core_session_get_private(session); + //assert(tech_pvt != NULL); + //channel = switch_core_session_get_channel(session); + //assert(channel != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "on_protocolfail\n"); +} + +static void on_sigchanstatus(uc_t *uc, switch_core_session_t *session, uc_event_t *e) +{ + //switch_channel_t *channel; + //private_t *tech_pvt; + + //tech_pvt = switch_core_session_get_private(session); + //assert(tech_pvt != NULL); + //channel = switch_core_session_get_channel(session); + //assert(channel != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "on_sigchanstatus\n"); +} + +static void on_detected(uc_t *uc, switch_core_session_t *session, uc_event_t *e) +{ + //switch_channel_t *channel; + //private_t *tech_pvt; + //struct channel_map *chanmap; + //char name[128]; + + //tech_pvt = switch_core_session_get_private(session); + //assert(tech_pvt != NULL); + //channel = switch_core_session_get_channel(session); + //assert(channel != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "on_detected\n"); + switch_mutex_lock(globals.channel_mutex); + + //chanmap = spri->private_info; + +#if 0 + if ((session = switch_core_session_locate(chanmap->map[e->offered.channel]))) + { + switch_log_printf(SWITCH_CHANNEL_LOG, + SWITCH_LOG_NOTICE, + "--Duplicate detected on channel s%dc%d (ignored)\n", + spri->span, + e->offered.channel); + switch_core_session_rwunlock(session); + switch_mutex_unlock(globals.channel_mutex); + return; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, + SWITCH_LOG_NOTICE, + "-- Detected on channel s%dc%d (from %s to %s)\n", + spri->span, + e->offered.channel, + e->offered.parms.originating_number, + e->offered.parms.destination_number); + + switch_mutex_unlock(chanmap->mutex); + + //pri_proceeding(spri->pri, e->offered.call, e->offered.channel, 0); + //pri_acknowledge(spri->pri, e->offered.call, e->offered.channel, 0); + + switch_mutex_unlock(chanmap->mutex); + + if ((session = unicall_incoming_channel(sigmsg, &session))) + { + } + else + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot create new inbound channel!\n"); + } +#endif + switch_mutex_unlock(globals.channel_mutex); +} + +static void on_offered(uc_t *uc, switch_core_session_t *session, uc_event_t *e) +{ + //switch_channel_t *channel; + //private_t *tech_pvt; + //struct channel_map *chanmap; + //char name[128]; + + //tech_pvt = switch_core_session_get_private(session); + //assert(tech_pvt != NULL); + //channel = switch_core_session_get_channel(session); + //assert(channel != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "on_offered\n"); +} + +static void on_requestmoreinfo(uc_t *uc, switch_core_session_t *session, uc_event_t *e) +{ + switch_channel_t *channel; + private_t *tech_pvt; + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "on_requestmoreinfo\n"); +} + +static void on_accepted(uc_t *uc, switch_core_session_t *session, uc_event_t *e) +{ + switch_channel_t *channel; + private_t *tech_pvt; + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "on_accepted\n"); +} + +static void on_callinfo(uc_t *uc, switch_core_session_t *session, uc_event_t *e) +{ + switch_channel_t *channel; + private_t *tech_pvt; + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "on_callinfo\n"); +} + +static void on_facility(uc_t *uc, switch_core_session_t *session, uc_event_t *e) +{ + switch_channel_t *channel; + private_t *tech_pvt; + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "on_facility\n"); +} + +static void on_dialednumber(uc_t *uc, switch_core_session_t *session, uc_event_t *e) +{ + switch_channel_t *channel; + private_t *tech_pvt; + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "on_dialednumber\n"); +} + +static void on_dialtone(uc_t *uc, switch_core_session_t *session, uc_event_t *e) +{ + switch_channel_t *channel; + private_t *tech_pvt; + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "on_dialtone\n"); +} + +static void on_dialing(uc_t *uc, switch_core_session_t *session, uc_event_t *e) +{ + switch_channel_t *channel; + private_t *tech_pvt; + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "on_dialing\n"); +} + +static void on_sendmoreinfo(uc_t *uc, switch_core_session_t *session, uc_event_t *e) +{ + switch_channel_t *channel; + private_t *tech_pvt; + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "on_sendmoreinfo\n"); +} + +static void on_proceeding(uc_t *uc, switch_core_session_t *session, uc_event_t *e) +{ + switch_channel_t *channel; + private_t *tech_pvt; + //struct channel_map *chanmap; + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "on_proceeding\n"); + +#if 0 + chanmap = spri->private_info; + + if ((session = switch_core_session_locate(chanmap->map[e->proceeding.channel]))) + { + switch_core_session_message_t *msg; + + switch_log_printf(SWITCH_CHANNEL_LOG, + SWITCH_LOG_NOTICE, + "-- Proceeding on channel s%dc%d\n", + spri->span, + e->proceeding.channel); + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + switch_core_session_pass_indication(session, SWITCH_MESSAGE_INDICATE_PROGRESS); + switch_channel_mark_pre_answered(channel); + + switch_core_session_rwunlock(session); + } + else + { + switch_log_printf(SWITCH_CHANNEL_LOG, + SWITCH_LOG_NOTICE, + "-- Proceeding on channel s%dc%d but it's not in use?\n", + spri->span, + e->proceeding.channel); + } +#endif +} + +static void on_alerting(uc_t *uc, switch_core_session_t *session, uc_event_t *e) +{ + switch_channel_t *channel; + private_t *tech_pvt; + //struct channel_map *chanmap; + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "on_alerting\n"); + +#if 0 + chanmap = spri->private_info; + + if ((session = switch_core_session_locate(chanmap->map[e->alerting.channel]))) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "-- Ringing on channel s%dc%d\n", spri->span, e->alerting.channel); + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + switch_core_session_pass_indication(session, SWITCH_MESSAGE_INDICATE_RINGING); + switch_channel_mark_ring_ready(channel); + + switch_core_session_rwunlock(session); + } + else + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "-- Ringing on channel s%dc%d %s but it's not in use?\n", spri->span, e->alerting.channel, chanmap->map[e->alerting.channel]); + } +#endif +} + +static void on_connected(uc_t *uc, switch_core_session_t *session, uc_event_t *e) +{ + switch_channel_t *channel; + private_t *tech_pvt; + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "on_connected\n"); +} + +static void on_answered(uc_t *uc, switch_core_session_t *session, uc_event_t *e) +{ + switch_channel_t *channel; + private_t *tech_pvt; + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "on_answered\n"); +} + +static void on_fardisconnected(uc_t *uc, switch_core_session_t *session, uc_event_t *e) +{ + switch_channel_t *channel; + private_t *tech_pvt; + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "on_fardisconnected\n"); +} + +static void on_dropcall(uc_t *uc, switch_core_session_t *session, uc_event_t *e) +{ + switch_channel_t *channel; + private_t *tech_pvt; + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "on_dropcall\n"); +} + +static void on_releasecall(uc_t *uc, switch_core_session_t *session, uc_event_t *e) +{ + switch_channel_t *channel; + private_t *tech_pvt; + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "on_releasecall\n"); +} + +static void on_farblocked(uc_t *uc, switch_core_session_t *session, uc_event_t *e) +{ + //switch_channel_t *channel; + //private_t *tech_pvt; + + //tech_pvt = switch_core_session_get_private(session); + //assert(tech_pvt != NULL); + //channel = switch_core_session_get_channel(session); + //assert(channel != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "on_farblocked\n"); +} + +static void on_farunblocked(uc_t *uc, switch_core_session_t *session, uc_event_t *e) +{ + //switch_channel_t *channel; + //private_t *tech_pvt; + + //tech_pvt = switch_core_session_get_private(session); + //assert(tech_pvt != NULL); + //channel = switch_core_session_get_channel(session); + //assert(channel != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "on_farunblocked\n"); +} + +static void on_localblocked(uc_t *uc, switch_core_session_t *session, uc_event_t *e) +{ + //switch_channel_t *channel; + //private_t *tech_pvt; + + //tech_pvt = switch_core_session_get_private(session); + //assert(tech_pvt != NULL); + //channel = switch_core_session_get_channel(session); + //assert(channel != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "on_localblocked\n"); +} + +static void on_localunblocked(uc_t *uc, switch_core_session_t *session, uc_event_t *e) +{ + //switch_channel_t *channel; + //private_t *tech_pvt; + + //tech_pvt = switch_core_session_get_private(session); + //assert(tech_pvt != NULL); + //channel = switch_core_session_get_channel(session); + //assert(channel != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "on_localunblocked\n"); +} + +static void on_alarm(uc_t *uc, switch_core_session_t *session, uc_event_t *e) +{ + switch_channel_t *channel; + private_t *tech_pvt; + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "on_alarm\n"); +} + +static void on_resetlinedev(uc_t *uc, switch_core_session_t *session, uc_event_t *e) +{ + switch_channel_t *channel; + private_t *tech_pvt; + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "on_resetlinedev\n"); +} + +static void on_l2frame(uc_t *uc, switch_core_session_t *session, uc_event_t *e) +{ + switch_channel_t *channel; + private_t *tech_pvt; + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "on_l2frame\n"); +} + +static void on_l2bufferfull(uc_t *uc, switch_core_session_t *session, uc_event_t *e) +{ + switch_channel_t *channel; + private_t *tech_pvt; + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "on_l2bufferfull\n"); +} + +static void on_l2nobuffer(uc_t *uc, switch_core_session_t *session, uc_event_t *e) +{ + switch_channel_t *channel; + private_t *tech_pvt; + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "on_l2nobuffer\n"); +} + +static void on_usrinfo(uc_t *uc, switch_core_session_t *session, uc_event_t *e) +{ + switch_channel_t *channel; + private_t *tech_pvt; + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "on_usrinfo\n"); +} + +static void handle_uc_event(uc_t *uc, void *user_data, uc_event_t *e) +{ + switch_core_session_t *session; + + session = (switch_core_session_t *) user_data; + assert(session != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "event %d\n", e->e); + switch (e->e) + { + case UC_EVENT_DEVICEFAIL: + on_devicefail(uc, session, e); + break; + case UC_EVENT_PROTOCOLFAIL: + on_protocolfail(uc, session, e); + break; + case UC_EVENT_SIGCHANSTATUS: + on_sigchanstatus(uc, session, e); + break; + case UC_EVENT_DETECTED: + on_detected(uc, session, e); + break; + case UC_EVENT_OFFERED: + on_offered(uc, session, e); + break; + case UC_EVENT_REQUESTMOREINFO: + on_requestmoreinfo(uc, session, e); + break; + case UC_EVENT_ACCEPTED: + on_accepted(uc, session, e); + break; + case UC_EVENT_CALLINFO: + on_callinfo(uc, session, e); + break; + case UC_EVENT_FACILITY: + on_facility(uc, session, e); + break; + case UC_EVENT_DIALEDNUMBER: + on_dialednumber(uc, session, e); + break; + case UC_EVENT_DIALTONE: + on_dialtone(uc, session, e); + break; + case UC_EVENT_DIALING: + on_dialing(uc, session, e); + break; + case UC_EVENT_SENDMOREINFO: + on_sendmoreinfo(uc, session, e); + break; + case UC_EVENT_PROCEEDING: + on_proceeding(uc, session, e); + break; + case UC_EVENT_ALERTING: + on_alerting(uc, session, e); + break; + case UC_EVENT_CONNECTED: + on_connected(uc, session, e); + break; + case UC_EVENT_ANSWERED: + on_answered(uc, session, e); + break; + case UC_EVENT_FARDISCONNECTED: + on_fardisconnected(uc, session, e); + break; + case UC_EVENT_DROPCALL: + on_dropcall(uc, session, e); + break; + case UC_EVENT_RELEASECALL: + on_releasecall(uc, session, e); + break; + case UC_EVENT_FARBLOCKED: + on_farblocked(uc, session, e); + break; + case UC_EVENT_FARUNBLOCKED: + on_farunblocked(uc, session, e); + break; + case UC_EVENT_LOCALBLOCKED: + on_localblocked(uc, session, e); + break; + case UC_EVENT_LOCALUNBLOCKED: + on_localunblocked(uc, session, e); + break; + case UC_EVENT_ALARM: + on_alarm(uc, session, e); + break; + case UC_EVENT_RESETLINEDEV: + on_resetlinedev(uc, session, e); + break; + case UC_EVENT_L2FRAME: + on_l2frame(uc, session, e); + break; + case UC_EVENT_L2BUFFERFULL: + on_l2bufferfull(uc, session, e); + break; + case UC_EVENT_L2NOBUFFER: + on_l2nobuffer(uc, session, e); + break; + case UC_EVENT_USRINFO: + on_usrinfo(uc, session, e); + break; + default: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "unknown unicall event %d\n", e->e); + break; + } +} + +static void tech_init(private_t *tech_pvt, switch_core_session_t *session) +{ + tech_pvt->read_frame.data = tech_pvt->databuf; + tech_pvt->read_frame.buflen = sizeof(tech_pvt->databuf); + switch_mutex_init(&tech_pvt->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); + switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); + switch_core_session_set_private(session, tech_pvt); + tech_pvt->session = session; +} + +/* + State methods they get called when the state changes to the specific state + returning SWITCH_STATUS_SUCCESS tells the core to execute the standard state method next + so if you fully implement the state you can return SWITCH_STATUS_FALSE to skip it. +*/ +static switch_status_t unicall_on_init(switch_core_session_t *session) +{ + switch_channel_t *channel; + private_t *tech_pvt; + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + +switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "unicall_on_init(%p)\n", (void *) session); + + switch_set_flag_locked(tech_pvt, TFLAG_IO); + + /* Move channel's state machine to ROUTING. This means the call is trying + to get from the initial start where the call because, to the point + where a destination has been identified. If the channel is simply + left in the initial state, nothing will happen. */ + switch_channel_set_state(channel, CS_ROUTING); + switch_mutex_lock(globals.mutex); + globals.calls++; + switch_mutex_unlock(globals.mutex); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t unicall_on_routing(switch_core_session_t *session) +{ + switch_channel_t *channel; + private_t *tech_pvt; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + +switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "unicall_on_routing(%p)\n", (void *) session); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL ROUTING\n", switch_channel_get_name(channel)); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t unicall_on_execute(switch_core_session_t *session) +{ + switch_channel_t *channel; + private_t *tech_pvt; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + +switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "unicall_on_execute(%p)\n", (void *) session); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL EXECUTE\n", switch_channel_get_name(channel)); + + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t unicall_on_hangup(switch_core_session_t *session) +{ + switch_channel_t *channel; + private_t *tech_pvt; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + +switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "unicall_on_hangup(%p)\n", (void *) session); + + switch_clear_flag_locked(tech_pvt, TFLAG_IO); + switch_clear_flag_locked(tech_pvt, TFLAG_VOICE); + //switch_thread_cond_signal(tech_pvt->cond); + + if (tech_pvt->read_codec.implementation) + switch_core_codec_destroy(&tech_pvt->read_codec); + if (tech_pvt->write_codec.implementation) + switch_core_codec_destroy(&tech_pvt->write_codec); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL HANGUP\n", switch_channel_get_name(channel)); + + //if ((ret = uc_call_control(uc, UC_OP_DROPCALL, crn, (void *) switch_channel_get_cause(channel)))) + // ???; + + switch_mutex_lock(globals.mutex); + if (--globals.calls < 0) + globals.calls = 0; + switch_mutex_unlock(globals.mutex); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t unicall_kill_channel(switch_core_session_t *session, int sig) +{ + switch_channel_t *channel = NULL; + private_t *tech_pvt = NULL; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + +switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "unicall_kill_channel(%p, %d)\n", (void *) session, sig); + + switch (sig) + { + case SWITCH_SIG_KILL: +switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "unicall_kill_channel(%p, %d) SIG_KILL\n", (void *) session, sig); + switch_clear_flag_locked(tech_pvt, TFLAG_IO); + switch_clear_flag_locked(tech_pvt, TFLAG_VOICE); + switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); + //switch_thread_cond_signal(tech_pvt->cond); + break; + case SWITCH_SIG_BREAK: +switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "unicall_kill_channel(%p, %d) SIG_BREAK\n", (void *) session, sig); + switch_set_flag_locked(tech_pvt, TFLAG_BREAK); + break; + default: +switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "unicall_kill_channel(%p, %d) DEFAULT\n", (void *) session, sig); + break; + } + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t unicall_on_exchange_media(switch_core_session_t *session) +{ +switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "unicall_on_exchange_media(%p)\n", (void *) session); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL LOOPBACK\n"); + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t unicall_on_soft_execute(switch_core_session_t *session) +{ +switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "unicall_on_soft_execute(%p)\n", (void *) session); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL TRANSMIT\n"); + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t unicall_send_dtmf(switch_core_session_t *session, const switch_dtmf_t *dtmf) +{ + private_t *tech_pvt = switch_core_session_get_private(session); + switch_assert(tech_pvt != NULL); + +switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "unicall_send_dtmf(%p)\n", (void *) session); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t unicall_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id) +{ + switch_channel_t *channel = NULL; + private_t *tech_pvt = NULL; + //switch_time_t started = switch_time_now(); + //unsigned int elapsed; + switch_byte_t *data; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "unicall_read_frame(%p)\n", (void *) session); + + tech_pvt->read_frame.flags = SFF_NONE; + *frame = NULL; + + while (switch_test_flag(tech_pvt, TFLAG_IO)) + { + if (switch_test_flag(tech_pvt, TFLAG_BREAK)) + { + switch_clear_flag(tech_pvt, TFLAG_BREAK); + data = (switch_byte_t *) tech_pvt->read_frame.data; + data[0] = 65; + data[1] = 0; + tech_pvt->read_frame.datalen = 2; + tech_pvt->read_frame.flags = SFF_CNG; + *frame = &tech_pvt->read_frame; + return SWITCH_STATUS_SUCCESS; + } + + if (!switch_test_flag(tech_pvt, TFLAG_IO)) + return SWITCH_STATUS_FALSE; + + if (switch_test_flag(tech_pvt, TFLAG_IO) && switch_test_flag(tech_pvt, TFLAG_VOICE)) + { + switch_clear_flag_locked(tech_pvt, TFLAG_VOICE); + if (!tech_pvt->read_frame.datalen) + continue; + *frame = &tech_pvt->read_frame; +#if defined(BIGENDIAN) + if (switch_test_flag(tech_pvt, TFLAG_LINEAR)) + switch_swap_linear((*frame)->data, (int) (*frame)->datalen / 2); +#endif + return SWITCH_STATUS_SUCCESS; + } + + switch_yield(1000); + } + + return SWITCH_STATUS_FALSE; +} + +static switch_status_t unicall_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id) +{ + switch_channel_t *channel = NULL; + private_t *tech_pvt = NULL; + //switch_frame_t *pframe; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "unicall_write_frame(%p)\n", (void *) session); + + if (!switch_test_flag(tech_pvt, TFLAG_IO)) + return SWITCH_STATUS_FALSE; +#if defined(BIGENDIAN) + if (switch_test_flag(tech_pvt, TFLAG_LINEAR)) + switch_swap_linear(frame->data, (int) frame->datalen/sizeof(int16_t)); +#endif + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t redirect_audio(switch_core_session_t *session, switch_core_session_message_t *msg) +{ + switch_channel_t *channel; + private_t *tech_pvt; + uc_t *uc; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + uc = tech_pvt->uc; + assert(uc != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "redirect_audio(%p)\n", (void *) session); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t transmit_text(switch_core_session_t *session, switch_core_session_message_t *msg) +{ + switch_channel_t *channel; + private_t *tech_pvt; + uc_t *uc; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + uc = tech_pvt->uc; + assert(uc != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "transmit_text(%p)\n", (void *) session); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t answer(switch_core_session_t *session, switch_core_session_message_t *msg) +{ + switch_channel_t *channel; + private_t *tech_pvt; + uc_t *uc; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + uc = tech_pvt->uc; + assert(uc != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "answer(%p)\n", (void *) session); + + //if ((ret = uc_call_control(uc, UC_OP_ANSWERCALL, crn, NULL))) + // ???; + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t progress(switch_core_session_t *session, switch_core_session_message_t *msg) +{ + switch_channel_t *channel; + private_t *tech_pvt; + uc_t *uc; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + uc = tech_pvt->uc; + assert(uc != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "progress(%p)\n", (void *) session); + + //if ((ret = uc_call_control(uc, UC_OP_ACCEPTCALL, crn, NULL))) + // ???; + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t bridge(switch_core_session_t *session, switch_core_session_message_t *msg) +{ + switch_channel_t *channel; + private_t *tech_pvt; + uc_t *uc; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + uc = tech_pvt->uc; + assert(uc != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "bridge(%p)\n", (void *) session); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t unbridge(switch_core_session_t *session, switch_core_session_message_t *msg) +{ + switch_channel_t *channel; + private_t *tech_pvt; + uc_t *uc; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + uc = tech_pvt->uc; + assert(uc != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "unbridge(%p)\n", (void *) session); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t transfer(switch_core_session_t *session, switch_core_session_message_t *msg) +{ + switch_channel_t *channel; + private_t *tech_pvt; + uc_t *uc; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + uc = tech_pvt->uc; + assert(uc != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "transfer(%p)\n", (void *) session); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t ringing(switch_core_session_t *session, switch_core_session_message_t *msg) +{ + switch_channel_t *channel; + private_t *tech_pvt; + uc_t *uc; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + uc = tech_pvt->uc; + assert(uc != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "ringing(%p)\n", (void *) session); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t media(switch_core_session_t *session, switch_core_session_message_t *msg) +{ + switch_channel_t *channel; + private_t *tech_pvt; + uc_t *uc; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + uc = tech_pvt->uc; + assert(uc != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "media(%p)\n", (void *) session); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t nomedia(switch_core_session_t *session, switch_core_session_message_t *msg) +{ + switch_channel_t *channel; + private_t *tech_pvt; + uc_t *uc; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + uc = tech_pvt->uc; + assert(uc != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "nomedia(%p)\n", (void *) session); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t hold(switch_core_session_t *session, switch_core_session_message_t *msg) +{ + switch_channel_t *channel; + private_t *tech_pvt; + uc_t *uc; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + uc = tech_pvt->uc; + assert(uc != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "hold(%p)\n", (void *) session); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t unhold(switch_core_session_t *session, switch_core_session_message_t *msg) +{ + switch_channel_t *channel; + private_t *tech_pvt; + uc_t *uc; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + uc = tech_pvt->uc; + assert(uc != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "unhold(%p)\n", (void *) session); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t redirect(switch_core_session_t *session, switch_core_session_message_t *msg) +{ + switch_channel_t *channel; + private_t *tech_pvt; + uc_t *uc; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + uc = tech_pvt->uc; + assert(uc != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "redirect(%p)\n", (void *) session); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t respond(switch_core_session_t *session, switch_core_session_message_t *msg) +{ + switch_channel_t *channel; + private_t *tech_pvt; + uc_t *uc; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + uc = tech_pvt->uc; + assert(uc != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "respond(%p)\n", (void *) session); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t broadcast(switch_core_session_t *session, switch_core_session_message_t *msg) +{ + switch_channel_t *channel; + private_t *tech_pvt; + uc_t *uc; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + uc = tech_pvt->uc; + assert(uc != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "broadcast(%p)\n", (void *) session); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t media_redirect(switch_core_session_t *session, switch_core_session_message_t *msg) +{ + switch_channel_t *channel; + private_t *tech_pvt; + uc_t *uc; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + uc = tech_pvt->uc; + assert(uc != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "media_redirect(%p)\n", (void *) session); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t deflect(switch_core_session_t *session, switch_core_session_message_t *msg) +{ + switch_channel_t *channel; + private_t *tech_pvt; + uc_t *uc; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + uc = tech_pvt->uc; + assert(uc != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "deflect(%p)\n", (void *) session); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t video_refresh_req(switch_core_session_t *session, switch_core_session_message_t *msg) +{ + switch_channel_t *channel; + private_t *tech_pvt; + uc_t *uc; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + uc = tech_pvt->uc; + assert(uc != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "video_refresh_req(%p)\n", (void *) session); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t display(switch_core_session_t *session, switch_core_session_message_t *msg) +{ + switch_channel_t *channel; + private_t *tech_pvt; + uc_t *uc; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + uc = tech_pvt->uc; + assert(uc != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "display(%p)\n", (void *) session); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t unicall_receive_message(switch_core_session_t *session, switch_core_session_message_t *msg) +{ + switch (msg->message_id) + { + case SWITCH_MESSAGE_REDIRECT_AUDIO: + return redirect_audio(session, msg); + case SWITCH_MESSAGE_TRANSMIT_TEXT: + return transmit_text(session, msg); + case SWITCH_MESSAGE_INDICATE_ANSWER: + return answer(session, msg); + case SWITCH_MESSAGE_INDICATE_PROGRESS: + return progress(session, msg); + case SWITCH_MESSAGE_INDICATE_BRIDGE: + return bridge(session, msg); + case SWITCH_MESSAGE_INDICATE_UNBRIDGE: + return unbridge(session, msg); + case SWITCH_MESSAGE_INDICATE_TRANSFER: + return transfer(session, msg); + case SWITCH_MESSAGE_INDICATE_RINGING: + return ringing(session, msg); + case SWITCH_MESSAGE_INDICATE_MEDIA: + return media(session, msg); + case SWITCH_MESSAGE_INDICATE_NOMEDIA: + return nomedia(session, msg); + case SWITCH_MESSAGE_INDICATE_HOLD: + return hold(session, msg); + case SWITCH_MESSAGE_INDICATE_UNHOLD: + return unhold(session, msg); + case SWITCH_MESSAGE_INDICATE_REDIRECT: + return redirect(session, msg); + case SWITCH_MESSAGE_INDICATE_RESPOND: + return respond(session, msg); + case SWITCH_MESSAGE_INDICATE_BROADCAST: + return broadcast(session, msg); + case SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT: + return media_redirect(session, msg); + case SWITCH_MESSAGE_INDICATE_DEFLECT: + return deflect(session, msg); + case SWITCH_MESSAGE_INDICATE_VIDEO_REFRESH_REQ: + return video_refresh_req(session, msg); + case SWITCH_MESSAGE_INDICATE_DISPLAY: + return display(session, msg); + default: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "unicall_receive_message(%p) %d\n", (void *) session, msg->message_id); + break; + } + + return SWITCH_STATUS_SUCCESS; +} + +/* Make sure when you have 2 sessions in the same scope that you pass the appropriate one to the routines + that allocate memory or you will have 1 channel with memory allocated from another channel's pool! +*/ +static switch_call_cause_t unicall_outgoing_channel(switch_core_session_t *session, + switch_event_t *var_event, + switch_caller_profile_t *outbound_profile, + switch_core_session_t **new_session, + switch_memory_pool_t **pool, + switch_originate_flag_t flags) +{ + private_t *tech_pvt; + switch_channel_t *channel; + switch_caller_profile_t *caller_profile; + uc_t *uc; + uc_makecall_t makecall; + uc_callparms_t *callparms; + int screen; + int hide; + char name[128]; + +switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "unicall_outgoing_channel(%p)\n", (void *) session); + + if ((*new_session = switch_core_session_request(unicall_endpoint_interface, pool)) == NULL) + { + return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + } + + switch_core_session_add_stream(*new_session, NULL); + if ((tech_pvt = (private_t *) switch_core_session_alloc(*new_session, sizeof(private_t))) == NULL) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Hey where is my memory pool?\n"); + switch_core_session_destroy(new_session); + return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + } + channel = switch_core_session_get_channel(*new_session); + tech_init(tech_pvt, *new_session); + + if (outbound_profile == NULL) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Doh! no caller profile\n"); + switch_core_session_destroy(new_session); + return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + } + snprintf(name, sizeof(name), "UNICALL/%s", outbound_profile->destination_number); + switch_channel_set_name(channel, name); + + caller_profile = switch_caller_profile_clone(*new_session, outbound_profile); + switch_channel_set_caller_profile(channel, caller_profile); + tech_pvt->caller_profile = caller_profile; + + uc = tech_pvt->uc; + + if ((callparms = uc_new_callparms(NULL)) == NULL) + return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + + //uc_callparm_bear_cap_transfer_cap(callparms, cap); + //uc_callparm_bear_cap_transfer_mode(callparms, mode); + //uc_callparm_bear_cap_transfer_rate(callparms, rate); + //uc_callparm_userinfo_layer1_protocol(callparms, prot); + //uc_callparm_user_rate(callparms, rate); + +switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "destination '%s'\n", outbound_profile->destination_number); + uc_callparm_destination_number(callparms, outbound_profile->destination_number); + uc_callparm_destination_ton(callparms, outbound_profile->destination_number_ton); + uc_callparm_destination_npi(callparms, outbound_profile->destination_number_numplan); + //uc_callparm_destination_sub_addr_number(callparms, num); + //uc_callparm_destination_sub_addr_ton(callparms, ton); + //uc_callparm_destination_sub_addr_npi(callparms, npi); + + //uc_callparm_redirecting_cause(callparms, cause); + //uc_callparm_redirecting_presentation(callparms, pres); + uc_callparm_redirecting_number(callparms, outbound_profile->rdnis); + uc_callparm_redirecting_ton(callparms, outbound_profile->rdnis_ton); + uc_callparm_redirecting_npi(callparms, outbound_profile->rdnis_numplan); + //uc_callparm_redirecting_subaddr(callparms, num); + //uc_callparm_redirecting_subaddr_ton(callparms, ton); + //uc_callparm_redirecting_subaddr_npi(callparms, npi); + + //uc_callparm_original_called_number(callparms, num); + //uc_callparm_original_called_number_ton(callparms, ton); + //uc_callparm_original_called_number_npi(callparms, npi); + +switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "caller id name '%s'\n", outbound_profile->caller_id_name); +switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "caller id number '%s'\n", outbound_profile->caller_id_number); + uc_callparm_originating_name(callparms, outbound_profile->caller_id_name); + uc_callparm_originating_number(callparms, outbound_profile->caller_id_number); + screen = switch_test_flag(outbound_profile, SWITCH_CPF_SCREEN); + hide = switch_test_flag(outbound_profile, SWITCH_CPF_HIDE_NUMBER); + if (!screen && !hide) + uc_callparm_originating_presentation(callparms, UC_PRES_ALLOWED_USER_NUMBER_NOT_SCREENED); + else if (!screen && hide) + uc_callparm_originating_presentation(callparms, UC_PRES_PROHIB_USER_NUMBER_NOT_SCREENED); + else if (screen && !hide) + uc_callparm_originating_presentation(callparms, UC_PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN); + else + uc_callparm_originating_presentation(callparms, UC_PRES_PROHIB_USER_NUMBER_PASSED_SCREEN); + uc_callparm_originating_ton(callparms, outbound_profile->caller_ton); + uc_callparm_originating_npi(callparms, outbound_profile->caller_numplan); + //uc_callparm_originating_sub_addr_ton(callparms, ton); + //uc_callparm_originating_sub_addr_npi(callparms, npi); + //uc_callparm_originating_sub_addr_number(callparms, num); + + uc_callparm_calling_party_category(callparms, UC_CALLER_CATEGORY_NATIONAL_SUBSCRIBER_CALL); + + makecall.callparms = callparms; + makecall.crn = 0; + +#if 0 + if ((ret = uc_call_control(uc, UC_OP_MAKECALL, 0, (void *) &makecall))) + ????; +#endif + free(callparms); + + switch_channel_set_flag(channel, CF_OUTBOUND); + switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); + switch_channel_set_state(channel, CS_INIT); +switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "unicall_outgoing_channel(%p) SUCCESS\n", (void *) session); + return SWITCH_CAUSE_SUCCESS; +} + +static switch_status_t unicall_receive_event(switch_core_session_t *session, switch_event_t *event) +{ + struct private_object *tech_pvt = switch_core_session_get_private(session); + char *body = switch_event_get_body(event); + + switch_assert(tech_pvt != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "unicall_receive_event(%p)\n", (void *) session); + + if (body == NULL) + body = ""; + + return SWITCH_STATUS_SUCCESS; +} + +static void *SWITCH_THREAD_FUNC unicall_thread_run(switch_thread_t *thread, void *obj) +{ + fd_set read; + fd_set write; + fd_set oob; + int fd; + int i; + int sel_on; + int ret; + switch_event_t *s_event; + uc_t *uc = (uc_t *) obj; + +#if 0 + switch_mutex_init(&chanmap.mutex, SWITCH_MUTEX_NESTED, module_pool); +#endif + + if (switch_event_create(&s_event, SWITCH_EVENT_PUBLISH) == SWITCH_STATUS_SUCCESS) + { + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "service", "_uc._tcp"); + switch_event_fire(&s_event); + } + + for (i = 0; i < MAX_SPANS; i++) + { + if (span_data[i]) + { + if ((ret = uc_call_control(span_data[i]->uc, UC_OP_UNBLOCK, 0, (void *) (intptr_t) -1)) < 0) + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Unblock failed - %s\n", uc_ret_to_str(ret)); + /*endif*/ + } + } + FD_ZERO(&read); + FD_ZERO(&write); + FD_ZERO(&oob); + for (;;) + { + i = 0; + sel_on = -1; + for (i = 0; i < MAX_SPANS; i++) + { + if (span_data[i]) + { + fd = span_data[i]->fd; + FD_SET(fd, &read); + //FD_SET(fd, &write); + //FD_SET(fd, &oob); + if (fd > sel_on) + sel_on = fd; + } + } + + if (sel_on > -1) + { + if (select(++sel_on, &read, NULL, NULL, NULL)) + { + for (i = 0; i < MAX_SPANS; i++) + { + if (span_data[i]) + { + fd = span_data[i]->fd; + if (FD_ISSET(fd, &read)) + { + uc_check_event(span_data[i]->uc); + uc_schedule_run(span_data[i]->uc); + } + } + } + } + } + } + + uc_delete(uc); + return NULL; +} + +static void unicall_thread_launch(uc_t *uc) +{ + switch_thread_t *thread; + switch_threadattr_t *thd_attr = NULL; + + switch_threadattr_create(&thd_attr, module_pool); + switch_threadattr_detach_set(thd_attr, 1); + switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); + switch_thread_create(&thread, thd_attr, unicall_thread_run, uc, module_pool); +} + +switch_state_handler_table_t unicall_state_handlers = +{ + /*.on_init */ unicall_on_init, + /*.on_routing */ unicall_on_routing, + /*.on_execute */ unicall_on_execute, + /*.on_hangup */ unicall_on_hangup, + /*.on_exchange_media */ unicall_on_exchange_media, + /*.on_soft_execute */ unicall_on_soft_execute +}; + +switch_io_routines_t unicall_io_routines = +{ + /*.outgoing_channel */ unicall_outgoing_channel, + /*.read_frame */ unicall_read_frame, + /*.write_frame */ unicall_write_frame, + /*.kill_channel */ unicall_kill_channel, + /*.send_dtmf */ unicall_send_dtmf, + /*.receive_message */ unicall_receive_message, + /*.receive_event */ unicall_receive_event +}; + +static switch_status_t config_unicall(int reload) +{ + const char *cf = "unicall.conf"; + switch_xml_t cfg; + switch_xml_t xml; + switch_xml_t settings; + switch_xml_t param; + switch_xml_t spans; + switch_xml_t span; + int current_span = 0; + int min_span = 0; + int max_span = 0; + int i; + char *id; + span_data_t *sp; + + if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "opening %s failed\n", cf); + return SWITCH_STATUS_TERM; + } + + if ((settings = switch_xml_child(cfg, "settings"))) + { + for (param = switch_xml_child(settings, "param"); param; param = param->next) + { + char *var = (char *) switch_xml_attr_soft(param, "name"); + char *val = (char *) switch_xml_attr_soft(param, "value"); + + if (!strcmp(var, "debug")) + { + globals.debug = atoi(val); + } + else if (!strcmp(var, "ms-per-frame")) + { + globals.frame_duration = atoi(val); + } + else if (!strcmp(var, "dtmf-on")) + { + globals.dtmf_on = atoi(val); + } + else if (!strcmp(var, "dtmf-off")) + { + globals.dtmf_off = atoi(val); + } + else if (!strcmp(var, "dialplan")) + { + set_global_dialplan(val); + } + else if (!strcmp(var, "suppress-dtmf-tone")) + { + globals.suppress_dtmf_tone = switch_true(val); + } + else if (!strcmp(var, "ignore-dtmf-tone")) + { + globals.ignore_dtmf_tone = switch_true(val); + } + } + } + spans = switch_xml_child(cfg, "spans"); + id = NULL; + for (span = switch_xml_child(spans, "span"); span; span = span->next) + { + id = (char *) switch_xml_attr(span, "id"); + + current_span = 0; + + if (id) + { + char *p; + + min_span = atoi(id); + if ((p = strchr(id, '-'))) + { + p++; + max_span = atoi(p); + } + else + { + max_span = min_span; + } + if (min_span < 1 || max_span < min_span) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid Span Config! [%s]\n", id); + continue; + } + } + else + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Missing SPAN ID!\n"); + continue; + } + for (i = min_span; i <= max_span; i++) + { + current_span = i; + + if (current_span <= 0 || current_span > MAX_SPANS) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid SPAN %d!\n", current_span); + current_span = 0; + continue; + } + if (span_data[current_span] == NULL) + { + if ((span_data[current_span] = switch_core_alloc(module_pool, sizeof(*span_data[current_span]))) == NULL) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "MEMORY ERROR\n"); + break; + } + sp = span_data[current_span]; + memset(sp, 0, sizeof(*sp)); + sp->span = current_span; + sp->protocol_class = NULL; + sp->protocol_variant = NULL; + sp->protocol_end = UC_MODE_CPE; + sp->outgoing_ok = TRUE; + } + sp = span_data[current_span]; + sp->id = strdup(id); + for (param = switch_xml_child(span, "param"); param; param = param->next) + { + char *var = (char *) switch_xml_attr_soft(param, "name"); + char *val = (char *) switch_xml_attr_soft(param, "value"); + + if (strcmp(var, "protocol-class") == 0) + { + sp->protocol_class = strdup(val); + } + else if (strcmp(var, "protocol-variant") == 0) + { + sp->protocol_variant = strdup(val); + } + else if (strcmp(var, "protocol-end") == 0) + { + if (strcasecmp(val, "co") == 0) + sp->protocol_end = UC_MODE_CO; + else if (strcasecmp(val, "cpe") == 0) + sp->protocol_end = UC_MODE_CPE; + else if (strcasecmp(val, "peer") == 0) + sp->protocol_end = UC_MODE_PEER; + } + else if (strcmp(var, "outgoing-allowed") == 0) + { + sp->outgoing_ok = switch_true(var); + } + else if (strcmp(var, "dialplan") == 0) + { + sp->dialplan = strdup(val); + } + else + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "UNKNOWN PARAMETER %s\n", var); + } + } + } + } + switch_xml_free(xml); + + if (globals.dialplan == NULL) + set_global_dialplan("XML"); + + globals.configured_spans = 0; + for (current_span = 1; current_span < MAX_SPANS; current_span++) + { + if (span_data[current_span]) + { + sp = span_data[current_span]; + if ((sp->uc = uc_create(sp->id, + sp->protocol_class, + sp->protocol_variant, + sp->protocol_end, + sp->outgoing_ok)) == NULL) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot launch span %d\n", current_span); + return SWITCH_STATUS_FALSE; + } + uc_get_device_handle(sp->uc, 0, &sp->fd); + uc_set_signaling_callback(sp->uc, handle_uc_event, (void *) (intptr_t) current_span); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Launched span %d\n", current_span); + unicall_thread_launch(sp->uc); + switch_mutex_lock(globals.hash_mutex); + globals.configured_spans++; + switch_mutex_unlock(globals.hash_mutex); + } + } + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_MODULE_LOAD_FUNCTION(mod_unicall_load) +{ + switch_status_t status = SWITCH_STATUS_SUCCESS; + + memset(span_data, 0, sizeof(span_data)); + + module_pool = pool; + + memset(&globals, 0, sizeof(globals)); + switch_core_hash_init(&globals.call_hash, module_pool); + switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, module_pool); + switch_mutex_init(&globals.hash_mutex, SWITCH_MUTEX_NESTED, module_pool); + switch_mutex_init(&globals.channel_mutex, SWITCH_MUTEX_NESTED, module_pool); + + if ((status = config_unicall(FALSE)) != SWITCH_STATUS_SUCCESS) + return status; + + *module_interface = switch_loadable_module_create_module_interface(pool, modname); + unicall_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE); + unicall_endpoint_interface->interface_name = "unicall"; + unicall_endpoint_interface->io_routines = &unicall_io_routines; + unicall_endpoint_interface->state_handler = &unicall_state_handlers; + + /* Indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +/* +SWITCH_MODULE_RUNTIME_FUNCTION(mod_unicall_runtime) +{ + return SWITCH_STATUS_TERM; +} +*/ + +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_unicall_shutdown) +{ + int x = 0; + + for (x = 0, running = -1; running && x <= 100; x++) + switch_yield(20000); + return SWITCH_STATUS_SUCCESS; +}

1 0

[commit] r9577 - freeswitch/trunk/src
by Freeswitch SVN 17 Sep '08

17 Sep '08

Author: mikej Date: Tue Sep 16 22:09:58 2008 New Revision: 9577 Modified: freeswitch/trunk/src/switch.c Log: (FSCORE-189) Improve daemonize code Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Tue Sep 16 22:09:58 2008 @@ -194,6 +194,58 @@ SetServiceStatus(hStatus, &status); } +#else + +void daemonize(void) { + int fd; + pid_t pid; + + switch (fork()) { + case 0: + break; + case -1: + fprintf(stderr, "Error Backgrounding (fork)! %d - %s\n", errno, strerror(errno)); + exit(0); + break; + default: + exit(0); + } + + if (setsid() < 0) { + fprintf(stderr, "Error Backgrounding (setsid)! %d - %s\n", errno, strerror(errno)); + exit(0); + } + pid = fork(); + switch (pid) { + case 0: + break; + case -1: + fprintf(stderr, "Error Backgrounding (fork2)! %d - %s\n", errno, strerror(errno)); + exit(0); + break; + default: + fprintf(stderr, "%d Backgrounding.\n", (int) pid); + exit(0); + } + + /* redirect std* to null */ + fd = open("/dev/null", O_RDONLY); + if (fd != 0) { + dup2(fd, 0); + close(fd); + } + fd = open("/dev/null", O_WRONLY); + if (fd != 1) { + dup2(fd, 1); + close(fd); + } + fd = open("/dev/null", O_WRONLY); + if (fd != 2) { + dup2(fd, 2); + close(fd); + } +} + #endif /* the main application entry point */ @@ -501,9 +553,8 @@ #ifdef WIN32 FreeConsole(); #else - if (!nf && (pid = fork())) { - fprintf(stderr, "%d Backgrounding.\n", (int) pid); - exit(0); + if (!nf) { + daemonize(); } #endif } @@ -530,12 +581,12 @@ memset(pid_buffer, 0, sizeof(pid_buffer)); switch_snprintf(pid_path, sizeof(pid_path), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, pfile); switch_snprintf(pid_buffer, sizeof(pid_buffer), "%d", pid); - pid_len = sizeof(pid_buffer); + pid_len = strlen(pid_buffer); apr_pool_create(&pool, NULL); if (switch_file_open(&fd, pid_path, - SWITCH_FOPEN_WRITE | SWITCH_FOPEN_CREATE, + SWITCH_FOPEN_WRITE | SWITCH_FOPEN_CREATE | SWITCH_FOPEN_TRUNCATE, SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE, pool) != SWITCH_STATUS_SUCCESS) { fprintf(stderr, "Cannot open pid file %s.\n", pid_path);

1 0

[commit] r9576 - in freeswitch/trunk/src/mod/languages: mod_mono mod_mono_managed
by Freeswitch SVN 16 Sep '08

16 Sep '08

Author: mikej Date: Tue Sep 16 19:54:23 2008 New Revision: 9576 Added: freeswitch/trunk/src/mod/languages/mod_mono/Makefile freeswitch/trunk/src/mod/languages/mod_mono/runswig.sh freeswitch/trunk/src/mod/languages/mod_mono_managed/Makefile Modified: freeswitch/trunk/src/mod/languages/mod_mono/freeswitch.i freeswitch/trunk/src/mod/languages/mod_mono/freeswitch_mono.h freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.cpp freeswitch/trunk/src/mod/languages/mod_mono/switch_platform.i freeswitch/trunk/src/mod/languages/mod_mono_managed/Loader.cs Log: (MODLANG-83) mod_mono Linux build & embedding Added: freeswitch/trunk/src/mod/languages/mod_mono/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/languages/mod_mono/Makefile Tue Sep 16 19:54:23 2008 @@ -0,0 +1,16 @@ +#MOD_CFLAGS=`pkg-config --cflags --libs mono` +MOD_CFLAGS=-D_REENTRANT -pthread -I/opt/mono-1.9/lib/pkgconfig/../../include/mono-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -lmono +#LDFLAGS=`pkg-config --libs mono` +BASE=../../../.. +VERBOSE=1 +include $(BASE)/build/modmake.rules +LOCAL_OBJS=freeswitch_mono.o freeswitch_wrap.o +local_depend: $(LOCAL_OBJS) + +freeswitch_mono.o: freeswitch_mono.h freeswitch_mono.cpp + +freeswitch_wrap.o: freeswitch_wrap.cpp + +freeswitch_wrap.cpp: freeswitch_wrap.cxx + cp freeswitch_wrap.cxx freeswitch_wrap.cpp + Modified: freeswitch/trunk/src/mod/languages/mod_mono/freeswitch.i ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_mono/freeswitch.i (original) +++ freeswitch/trunk/src/mod/languages/mod_mono/freeswitch.i Tue Sep 16 19:54:23 2008 @@ -107,6 +107,7 @@ %ignore switch_core_session_get_event_hooks; %ignore switch_inet_pton; %ignore switch_xml_idx; +%ignore switch_xml_pi; // Real header includes now %import switch_platform.i // This will give us all the macros we need to compile the other stuff Modified: freeswitch/trunk/src/mod/languages/mod_mono/freeswitch_mono.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_mono/freeswitch_mono.h (original) +++ freeswitch/trunk/src/mod/languages/mod_mono/freeswitch_mono.h Tue Sep 16 19:54:23 2008 @@ -44,6 +44,7 @@ MonoDomain *domain; MonoAssembly *mod_mono_asm; switch_memory_pool_t *pool; + switch_bool_t embedded; MonoMethod *loadMethod; MonoMethod *unloadMethod; @@ -76,4 +77,4 @@ guint32 hangupDelegateHandle; // GCHandle to the hangup delegate }; -#endif \ No newline at end of file +#endif Modified: freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.cpp Tue Sep 16 19:54:23 2008 @@ -47,12 +47,18 @@ #ifdef WIN32 #include <shlobj.h> #define EXPORT __declspec(dllexport) -#elif +#else #define EXPORT #endif #define MOD_MONO_MANAGED_DLL "mod_mono_managed.dll" - + +#define MOD_MONO_MANAGED_ASM_NAME "mod_mono_managed" +#define MOD_MONO_MANAGED_ASM_V1 1 +#define MOD_MONO_MANAGED_ASM_V2 0 +#define MOD_MONO_MANAGED_ASM_V3 0 +#define MOD_MONO_MANAGED_ASM_V4 0 + mod_mono_globals globals = { 0 }; @@ -120,7 +126,7 @@ return SWITCH_STATUS_SUCCESS; } -#elif +#else // On other platforms, it should just work if it hasn't been relocated mono_set_dirs(NULL, NULL); return SWITCH_STATUS_SUCCESS; @@ -137,20 +143,41 @@ switch_snprintf(filename, 256, "%s%s%s", SWITCH_GLOBAL_dirs.mod_dir, SWITCH_PATH_SEPARATOR, MOD_MONO_MANAGED_DLL); globals.domain = mono_jit_init(filename); - if (!globals.domain) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mono_jit_init failed.\n"); - return SWITCH_STATUS_FALSE; + /* Already got a Mono domain? */ + if ((globals.domain = mono_get_root_domain())) { + mono_thread_attach(globals.domain); + globals.embedded = SWITCH_TRUE; + } else { + if (!(globals.domain = mono_jit_init(filename))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mono_jit_init failed.\n"); + return SWITCH_STATUS_FALSE; + } } - /* Open the assembly */ - globals.mod_mono_asm = mono_domain_assembly_open(globals.domain, filename); - - if (!globals.mod_mono_asm) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mono_domain_assembly_open failed.\n"); - return SWITCH_STATUS_FALSE; + /* Already loaded? */ + MonoAssemblyName name; + name.name = MOD_MONO_MANAGED_ASM_NAME; + name.major = MOD_MONO_MANAGED_ASM_V1; + name.minor = MOD_MONO_MANAGED_ASM_V2; + name.revision = MOD_MONO_MANAGED_ASM_V3; + name.build = MOD_MONO_MANAGED_ASM_V4; + name.culture = ""; + name.hash_value = ""; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Calling mono_assembly_loaded"); + + if (!(globals.mod_mono_asm = mono_assembly_loaded(&name))) { + /* Open the assembly */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Calling mono_domain_assembly_open"); + globals.mod_mono_asm = mono_domain_assembly_open(globals.domain, filename); + if (!globals.mod_mono_asm) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mono_domain_assembly_open failed.\n"); + return SWITCH_STATUS_FALSE; + } } return SWITCH_STATUS_SUCCESS; + } MonoMethod * getMethod(const char *name, MonoClass * klass) @@ -226,7 +253,7 @@ /* Not sure if this is necesary on the loading thread */ mono_thread_attach(globals.domain); - mono_add_internal_call("FreeSWITCH.Native.MonoSession::InitMonoSession", InitMonoSession); + mono_add_internal_call("FreeSWITCH.Native.MonoSession::InitMonoSession", (void *)InitMonoSession); /* Run loader */ MonoObject * objResult; @@ -360,9 +387,9 @@ mono_print_unhandled_exception(ex); } - mono_runtime_set_shutting_down(); - mono_runtime_cleanup(globals.domain); - mono_runtime_quit(); + if (!globals.embedded) { + mono_jit_cleanup(globals.domain); + } return SWITCH_STATUS_SUCCESS; } Added: freeswitch/trunk/src/mod/languages/mod_mono/runswig.sh ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/languages/mod_mono/runswig.sh Tue Sep 16 19:54:23 2008 @@ -0,0 +1,5 @@ +#!/bin/bash +swig -I../../../include -v -O -c++ -csharp -namespace FreeSWITCH.Native -dllimport mod_mono freeswitch.i +rm -f ../mod_mono_managed/swig.cs +cat *.cs > ../mod_mono_managed/swig.cs +rm -f *.cs Modified: freeswitch/trunk/src/mod/languages/mod_mono/switch_platform.i ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_mono/switch_platform.i (original) +++ freeswitch/trunk/src/mod/languages/mod_mono/switch_platform.i Tue Sep 16 19:54:23 2008 @@ -14,6 +14,20 @@ // we define char as byte. // TODO: Possible? It'd be nice to do the whole char*->IntPtr->Marshal/Free thing here instead of swigStringFix +%typemap(imtype, out="string") char ** "ref string" +%typemap(cstype, out="string") char ** "ref string" +%typemap(csin) char ** "ref $csinput" +%typemap(csvarin) char ** +%{ + set { $imcall; } +%} +%typemap(csvarout) char ** +%{ + get { + return $imcall; + } +%} + #define SWITCH_DECLARE(type) type #define SWITCH_DECLARE_NONSTD(type) type #define SWITCH_MOD_DECLARE(type) type @@ -42,4 +56,4 @@ #define _Out_cap_(x) #define _Out_z_cap_(x) #define _Out_ptrdiff_cap_(x) -#define _Out_opt_ptrdiff_cap_(x) \ No newline at end of file +#define _Out_opt_ptrdiff_cap_(x) Modified: freeswitch/trunk/src/mod/languages/mod_mono_managed/Loader.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_mono_managed/Loader.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_mono_managed/Loader.cs Tue Sep 16 19:54:23 2008 @@ -100,22 +100,22 @@ } } - static List<Assembly> loadAssemblies(string managedDir) + static Assembly[] loadAssemblies(string managedDir) { - return Directory.GetFiles(managedDir, "*.dll", SearchOption.AllDirectories) - .Select(f => Path.Combine(managedDir, f)) - .Select(f => { - try { - return System.Reflection.Assembly.LoadFile(f); - } - catch (Exception ex) { - Log.WriteLine(LogLevel.Notice, "Assembly.LoadFile failed; skipping {0} ({1})", f, ex.Message); - return null; - } - }) - .Where(a => a != null) - .Concat(new[] { System.Reflection.Assembly.GetExecutingAssembly() }) // Add in our own to load Demo or built-in things if added - .ToList(); + // load the modules in the mod/mono directory + Log.WriteLine(LogLevel.Notice, "loadAssemblies: {0}", managedDir); + foreach (string s in Directory.GetFiles(managedDir, "*.dll", SearchOption.AllDirectories)) + { + string f = Path.Combine(managedDir, s); + try { + System.Reflection.Assembly.LoadFile(f); + } + catch (Exception ex) { + Log.WriteLine(LogLevel.Notice, "Assembly.LoadFile failed; skipping {0} ({1})", f, ex.Message); + } + } + + return AppDomain.CurrentDomain.GetAssemblies(); // Includes anything else already loaded } public static void Unload() Added: freeswitch/trunk/src/mod/languages/mod_mono_managed/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/languages/mod_mono_managed/Makefile Tue Sep 16 19:54:23 2008 @@ -0,0 +1,13 @@ +all: Debug Debug/mod_mono_managed.dll + +clean: + rm -fr Debug + +Debug: + mkdir Debug + +Debug/mod_mono_managed.dll: Loader.cs MonoSession.cs ApiFunction.cs AppFunction.cs Extensions.cs Log.cs Demo.cs swig.cs + gmcs -target:library -out:Debug/mod_mono_managed.dll -d:DEBUG Loader.cs MonoSession.cs ApiFunction.cs AppFunction.cs Extensions.cs Log.cs Demo.cs swig.cs + +install: Debug/mod_mono_managed.dll + install Debug/mod_mono_managed.dll /usr/local/freeswitch/mod

1 0

[commit] r9575 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 16 Sep '08

16 Sep '08

Author: anthm Date: Tue Sep 16 17:52:12 2008 New Revision: 9575 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: tweak Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Tue Sep 16 17:52:12 2008 @@ -2181,8 +2181,12 @@ if (status == 183 && !r_sdp) { status = 180; + } + + if (status == 180 && r_sdp) { + status = 183; } - + if (channel && (status == 180 || status == 183) && switch_channel_test_flag(channel, CF_OUTBOUND)) { const char *val; if ((val = switch_channel_get_variable(channel, "sip_auto_answer")) && switch_true(val)) { @@ -2219,7 +2223,7 @@ } } } - + if (r_sdp) { if (switch_channel_test_flag(channel, CF_PROXY_MODE) || switch_channel_test_flag(channel, CF_PROXY_MEDIA)) { switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA); @@ -2474,24 +2478,27 @@ } goto done; } - + if (channel) { - if (switch_test_flag(tech_pvt, TFLAG_EARLY_MEDIA)) { - switch_set_flag_locked(tech_pvt, TFLAG_ANS); - switch_set_flag(tech_pvt, TFLAG_SDP); - switch_channel_mark_answered(channel); - if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE)) - && (other_session = switch_core_session_locate(uuid))) { - other_channel = switch_core_session_get_channel(other_session); - switch_channel_answer(other_channel); - switch_core_session_rwunlock(other_session); + if (switch_test_flag(tech_pvt, TFLAG_EARLY_MEDIA)) { + switch_set_flag_locked(tech_pvt, TFLAG_ANS); + switch_set_flag(tech_pvt, TFLAG_SDP); + switch_channel_mark_answered(channel); + if (switch_channel_test_flag(channel, CF_PROXY_MODE) || switch_channel_test_flag(channel, CF_PROXY_MEDIA)) { + if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE)) + && (other_session = switch_core_session_locate(uuid))) { + other_channel = switch_core_session_get_channel(other_session); + switch_channel_answer(other_channel); + switch_core_session_rwunlock(other_session); + } } - goto done; - } - + goto done; + } + if (!r_sdp && !switch_test_flag(tech_pvt, TFLAG_SDP)) { r_sdp = (const char *) switch_channel_get_variable(channel, SWITCH_R_SDP_VARIABLE); } + if (r_sdp && !switch_test_flag(tech_pvt, TFLAG_SDP)) { if (switch_channel_test_flag(channel, CF_PROXY_MODE) || switch_channel_test_flag(channel, CF_PROXY_MEDIA)) { switch_set_flag_locked(tech_pvt, TFLAG_ANS);

1 0

[commit] r9574 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 16 Sep '08

16 Sep '08

Author: anthm Date: Tue Sep 16 16:04:33 2008 New Revision: 9574 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: omit chat_hash code when presence is not enabled Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Tue Sep 16 16:04:33 2008 @@ -3782,7 +3782,9 @@ } if (tech_pvt->hash_key) { + switch_mutex_lock(tech_pvt->profile->flag_mutex); switch_core_hash_delete(tech_pvt->profile->chat_hash, tech_pvt->hash_key); + switch_mutex_unlock(tech_pvt->profile->flag_mutex); } nua_handle_bind(nh, NULL); 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 Tue Sep 16 16:04:33 2008 @@ -1231,8 +1231,12 @@ tech_pvt->chat_from = tech_pvt->from_str; tech_pvt->chat_to = tech_pvt->dest; - tech_pvt->hash_key = switch_core_session_strdup(tech_pvt->session, hash_key); - switch_core_hash_insert(tech_pvt->profile->chat_hash, tech_pvt->hash_key, tech_pvt); + if (tech_pvt->profile->pflags & PFLAG_PRESENCE) { + tech_pvt->hash_key = switch_core_session_strdup(tech_pvt->session, hash_key); + switch_mutex_lock(tech_pvt->profile->flag_mutex); + switch_core_hash_insert(tech_pvt->profile->chat_hash, tech_pvt->hash_key, tech_pvt); + switch_mutex_unlock(tech_pvt->profile->flag_mutex); + } free(e_dest); } 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 Tue Sep 16 16:04:33 2008 @@ -1724,10 +1724,11 @@ } else { return; } - + + switch_mutex_lock(tech_pvt->profile->flag_mutex); tech_pvt->hash_key = switch_core_session_strdup(tech_pvt->session, hash_key); switch_core_hash_insert(tech_pvt->profile->chat_hash, tech_pvt->hash_key, tech_pvt); - + switch_mutex_unlock(tech_pvt->profile->flag_mutex); } /* For Emacs:

1 0

[commit] r9573 - in freeswitch/trunk/src: . include mod/event_handlers/mod_cdr_csv mod/xml_int/mod_xml_cdr
by Freeswitch SVN 16 Sep '08

16 Sep '08

Author: anthm Date: Tue Sep 16 13:12:14 2008 New Revision: 9573 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c freeswitch/trunk/src/switch_core.c Log: improve shutdown/unload Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Tue Sep 16 13:12:14 2008 @@ -350,6 +350,8 @@ */ SWITCH_DECLARE(int) switch_core_add_state_handler(_In_ const switch_state_handler_table_t *state_handler); +SWITCH_DECLARE(void) switch_core_remove_state_handler(_In_ const switch_state_handler_table_t *state_handler); + /*! \brief Access a state handler \param index the desired index to access Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Tue Sep 16 13:12:14 2008 @@ -60,7 +60,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_cdr_csv_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_cdr_csv_shutdown); -SWITCH_MODULE_DEFINITION(mod_cdr_csv, mod_cdr_csv_load, NULL, NULL); +SWITCH_MODULE_DEFINITION(mod_cdr_csv, mod_cdr_csv_load, mod_cdr_csv_shutdown, NULL); static off_t fd_size(int fd) { @@ -172,6 +172,10 @@ const char *log_dir = NULL, *accountcode = NULL, *a_template_str = NULL, *g_template_str = NULL; char *log_line, *path = NULL; + if (globals.shutdown) { + return SWITCH_STATUS_SUCCESS; + } + if (!((globals.legs & CDR_LEG_A) && (globals.legs & CDR_LEG_B))) { if ((globals.legs & CDR_LEG_A)) { if (switch_channel_get_originator_caller_profile(channel)) { @@ -258,6 +262,10 @@ void *val; cdr_fd_t *fd; + if (globals.shutdown) { + return; + } + if (sig && !strcmp(sig, "HUP")) { for (hi = switch_hash_first(NULL, globals.fd_hash); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, NULL, NULL, &val); @@ -384,7 +392,11 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_cdr_csv_shutdown) { - globals.shutdown = 1; + globals.shutdown = 1; + switch_event_unbind_callback(event_handler); + switch_core_remove_state_handler(&state_handlers); + + return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Tue Sep 16 13:12:14 2008 @@ -78,6 +78,10 @@ switch_channel_t *channel = switch_core_session_get_channel(session); switch_status_t status = SWITCH_STATUS_FALSE; + if (globals.shutdown) { + return SWITCH_STATUS_SUCCESS; + } + if (!globals.log_b && channel && switch_channel_get_originator_caller_profile(channel)) { return SWITCH_STATUS_SUCCESS; } @@ -344,6 +348,8 @@ { globals.shutdown = 1; + + switch_core_remove_state_handler(&state_handlers); return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Sep 16 13:12:14 2008 @@ -163,15 +163,46 @@ return handle; } +SWITCH_DECLARE(void) switch_core_remove_state_handler(const switch_state_handler_table_t *state_handler) +{ + int index, total = 0; + const switch_state_handler_table_t *tmp[SWITCH_MAX_STATE_HANDLERS+1] = { 0 }; + + switch_mutex_lock(runtime.global_mutex); + + for (index = 0; index < runtime.state_handler_index; index++) { + const switch_state_handler_table_t *cur = runtime.state_handlers[index]; + runtime.state_handlers[index] = NULL; + if (cur == state_handler) { + continue; + } + tmp[index] = runtime.state_handlers[index]; + total++; + } + + runtime.state_handler_index = 0; + + for (index = 0; index < total; index++) { + runtime.state_handlers[runtime.state_handler_index++] = tmp[index]; + } + switch_mutex_unlock(runtime.global_mutex); +} + + SWITCH_DECLARE(int) switch_core_add_state_handler(const switch_state_handler_table_t *state_handler) { - int index = runtime.state_handler_index++; + int index; + + switch_mutex_lock(runtime.global_mutex); + index = runtime.state_handler_index++; if (runtime.state_handler_index >= SWITCH_MAX_STATE_HANDLERS) { - return -1; + index = -1; + } else { + runtime.state_handlers[index] = state_handler; } - runtime.state_handlers[index] = state_handler; + switch_mutex_unlock(runtime.global_mutex); return index; }

1 0