November 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r10261 - freeswitch/trunk/src
by Freeswitch SVN 06 Nov '08

06 Nov '08

Author: anthm Date: Wed Nov 5 19:09:44 2008 New Revision: 10261 Modified: freeswitch/trunk/src/switch_odbc.c Log: fix leak Modified: freeswitch/trunk/src/switch_odbc.c ============================================================================== --- freeswitch/trunk/src/switch_odbc.c (original) +++ freeswitch/trunk/src/switch_odbc.c Wed Nov 5 19:09:44 2008 @@ -359,7 +359,8 @@ char **names; char **vals; int y = 0; - + int done = 0; + if (!(result = SQLFetch(stmt)) == SQL_SUCCESS) { break; } @@ -385,7 +386,7 @@ } if (callback(pdata, y, vals, names)) { - break; + done = 1; } for (x = 0; x < y; x++) { @@ -394,6 +395,10 @@ } free(names); free(vals); + + if (done) { + break; + } } SQLFreeHandle(SQL_HANDLE_STMT, stmt);

1 0

[commit] r10260 - freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr
by Freeswitch SVN 05 Nov '08

05 Nov '08

Author: mikej Date: Wed Nov 5 16:53:33 2008 New Revision: 10260 Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Log: (MODEVENT-29) seg on unload of mod_radius_cdr when it is in the middle of a radius call Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Wed Nov 5 16:53:33 2008 @@ -41,6 +41,7 @@ static struct { int shutdown; + switch_thread_rwlock_t *rwlock; } globals = { 0 }; static char cf[] = "mod_radius_cdr.conf"; @@ -134,7 +135,7 @@ switch_xml_t cdr; switch_channel_t *channel = switch_core_session_get_channel(session); rc_handle *rad_config; - int retval = 0; + switch_status_t retval = SWITCH_STATUS_TERM; VALUE_PAIR *send = NULL; uint32_t client_port = 0; uint32_t status_type = PW_STATUS_START; @@ -150,18 +151,24 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[mod_radius_cdr] Entering my_on_routing\n"); + if (globals.shutdown) { + return SWITCH_STATUS_FALSE; + } + + switch_thread_rwlock_rdlock(globals.rwlock); + rad_config = my_radius_init(); if (rad_config == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Error initializing radius, Start packet not logged.\n"); - return SWITCH_STATUS_TERM; + goto end; } if (switch_ivr_generate_xml_cdr(session, &cdr) == SWITCH_STATUS_SUCCESS) { uuid_str = switch_core_session_get_uuid(session); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Error Generating Data!\n"); - return SWITCH_STATUS_TERM; + goto end; } /* Create the radius packet */ @@ -170,13 +177,13 @@ if (rc_avpair_add(rad_config, &send, PW_ACCT_STATUS_TYPE, &status_type, -1, 0) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Failed setting Acct-Status-Type: Start\n"); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } if (rc_avpair_add(rad_config, &send, PW_ACCT_SESSION_ID, uuid_str, -1, 0) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Failed adding Acct-Session-ID: %s\n", uuid_str); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } /* Add VSAs */ @@ -207,77 +214,77 @@ if (rc_avpair_add(rad_config, &send, PW_USER_NAME, (void *) profile->username, -1, 0) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding User-Name: %s\n", profile->username); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } if (profile->caller_id_number) { if (rc_avpair_add(rad_config, &send, PW_FS_SRC, (void *) profile->caller_id_number, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Src: %s\n", profile->caller_id_number); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } if (profile->caller_id_name) { if (rc_avpair_add(rad_config, &send, PW_FS_CLID, (void *) profile->caller_id_name, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-CLID: %s\n", profile->caller_id_name); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } if (profile->destination_number) { if (rc_avpair_add(rad_config, &send, PW_FS_DST, (void *) profile->destination_number, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Dst: %s\n", profile->destination_number); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } if (profile->dialplan) { if (rc_avpair_add(rad_config, &send, PW_FS_DIALPLAN, (void *) profile->dialplan, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Dialplan: %s\n", profile->dialplan); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } if (profile->network_addr) { if (rc_avpair_add(rad_config, &send, PW_FRAMED_IP_ADDRESS, (void *) profile->network_addr, -1, 0) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Framed-IP-Address: %s\n", profile->network_addr); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } if (profile->rdnis) { if (rc_avpair_add(rad_config, &send, PW_FS_RDNIS, (void *) profile->rdnis, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-RDNIS: %s\n", profile->rdnis); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } if (profile->context) { if (rc_avpair_add(rad_config, &send, PW_FS_CONTEXT, (void *) profile->context, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Context: %s\n", profile->context); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } if (profile->ani) { if (rc_avpair_add(rad_config, &send, PW_FS_ANI, (void *) profile->ani, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-ANI: %s\n", profile->ani); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } if (profile->aniii) { if (rc_avpair_add(rad_config, &send, PW_FS_ANIII, (void *) profile->aniii, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-ANIII: %s\n", profile->aniii); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } if (profile->source) { if (rc_avpair_add(rad_config, &send, PW_FS_SOURCE, (void *) profile->source, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Source: %s\n", profile->source); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } if (callstartdate > 0) { @@ -288,7 +295,7 @@ if (rc_avpair_add(rad_config, &send, PW_FS_CALLSTARTDATE, &buffer, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Callstartdate: %s\n", buffer); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } @@ -300,7 +307,7 @@ if (rc_avpair_add(rad_config, &send, PW_FS_CALLANSWERDATE, &buffer, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Callanswerdate: %s\n", buffer); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } @@ -312,7 +319,7 @@ if (rc_avpair_add(rad_config, &send, PW_FS_CALLTRANSFERDATE, &buffer, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Calltransferdate: %s\n", buffer); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } @@ -324,7 +331,7 @@ if (rc_avpair_add(rad_config, &send, PW_FS_CALLENDDATE, &buffer, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Callenddate: %s\n", buffer); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } @@ -333,7 +340,7 @@ (void *) profile->caller_extension->last_application->application_name, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Lastapp: %s\n", profile->source); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } } else { @@ -349,7 +356,8 @@ retval = SWITCH_STATUS_TERM; } rc_avpair_free(send); - + end: + switch_thread_rwlock_unlock(globals.rwlock); return (retval); } @@ -358,7 +366,7 @@ switch_xml_t cdr; switch_channel_t *channel = switch_core_session_get_channel(session); rc_handle *rad_config; - int retval = 0; + switch_status_t retval = SWITCH_STATUS_TERM; VALUE_PAIR *send = NULL; uint32_t client_port = 0; uint32_t status_type = PW_STATUS_STOP; @@ -377,20 +385,22 @@ return SWITCH_STATUS_FALSE; } + switch_thread_rwlock_rdlock(globals.rwlock); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[mod_radius_cdr] Entering my_on_hangup\n"); rad_config = my_radius_init(); if (rad_config == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Error initializing radius, session not logged.\n"); - return SWITCH_STATUS_TERM; + goto end; } if (switch_ivr_generate_xml_cdr(session, &cdr) == SWITCH_STATUS_SUCCESS) { uuid_str = switch_core_session_get_uuid(session); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Error Generating Data!\n"); - return SWITCH_STATUS_TERM; + goto end; } /* Create the radius packet */ @@ -399,13 +409,13 @@ if (rc_avpair_add(rad_config, &send, PW_ACCT_STATUS_TYPE, &status_type, -1, 0) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Acct-Session-ID: %s\n", uuid_str); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } if (rc_avpair_add(rad_config, &send, PW_ACCT_SESSION_ID, uuid_str, -1, 0) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Acct-Session-ID: %s\n", uuid_str); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } /* Add VSAs */ @@ -418,7 +428,7 @@ if (rc_avpair_add(rad_config, &send, PW_FS_HANGUPCAUSE, &cause, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Hangupcause: %d\n", cause); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } profile = switch_channel_get_caller_profile(channel); @@ -452,77 +462,77 @@ if (rc_avpair_add(rad_config, &send, PW_USER_NAME, (void *) profile->username, -1, 0) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding User-Name: %s\n", profile->username); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } if (profile->caller_id_number) { if (rc_avpair_add(rad_config, &send, PW_FS_SRC, (void *) profile->caller_id_number, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Src: %s\n", profile->caller_id_number); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } if (profile->caller_id_name) { if (rc_avpair_add(rad_config, &send, PW_FS_CLID, (void *) profile->caller_id_name, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-CLID: %s\n", profile->caller_id_name); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } if (profile->destination_number) { if (rc_avpair_add(rad_config, &send, PW_FS_DST, (void *) profile->destination_number, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Dst: %s\n", profile->destination_number); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } if (profile->dialplan) { if (rc_avpair_add(rad_config, &send, PW_FS_DIALPLAN, (void *) profile->dialplan, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Dialplan: %s\n", profile->dialplan); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } if (profile->network_addr) { if (rc_avpair_add(rad_config, &send, PW_FRAMED_IP_ADDRESS, (void *) profile->network_addr, -1, 0) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Framed-IP-Address: %s\n", profile->network_addr); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } if (profile->rdnis) { if (rc_avpair_add(rad_config, &send, PW_FS_RDNIS, (void *) profile->rdnis, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-RDNIS: %s\n", profile->rdnis); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } if (profile->context) { if (rc_avpair_add(rad_config, &send, PW_FS_CONTEXT, (void *) profile->context, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Context: %s\n", profile->context); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } if (profile->ani) { if (rc_avpair_add(rad_config, &send, PW_FS_ANI, (void *) profile->ani, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-ANI: %s\n", profile->ani); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } if (profile->aniii) { if (rc_avpair_add(rad_config, &send, PW_FS_ANIII, (void *) profile->aniii, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-ANIII: %s\n", profile->aniii); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } if (profile->source) { if (rc_avpair_add(rad_config, &send, PW_FS_SOURCE, (void *) profile->source, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Source: %s\n", profile->source); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } if (profile->caller_extension && profile->caller_extension->last_application->application_name) { @@ -530,13 +540,13 @@ (void *) profile->caller_extension->last_application->application_name, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Lastapp: %s\n", profile->source); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } if (rc_avpair_add(rad_config, &send, PW_FS_BILLUSEC, &billusec, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Billusec: %u\n", (uint32_t) billusec); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } if (callstartdate > 0) { @@ -547,7 +557,7 @@ if (rc_avpair_add(rad_config, &send, PW_FS_CALLSTARTDATE, &buffer, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Callstartdate: %s\n", buffer); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } @@ -559,7 +569,7 @@ if (rc_avpair_add(rad_config, &send, PW_FS_CALLANSWERDATE, &buffer, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Callanswerdate: %s\n", buffer); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } @@ -571,7 +581,7 @@ if (rc_avpair_add(rad_config, &send, PW_FS_CALLTRANSFERDATE, &buffer, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Calltransferdate: %s\n", buffer); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } @@ -583,14 +593,14 @@ if (rc_avpair_add(rad_config, &send, PW_FS_CALLENDDATE, &buffer, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Callenddate: %s\n", buffer); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } if (rc_avpair_add(rad_config, &send, PW_ACCT_SESSION_TIME, &billsec, -1, 0) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Acct-Session-Time: %u\n", billsec); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + goto end; } } else { /* no profile, can't create data to send */ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "profile == NULL\n"); @@ -606,6 +616,8 @@ } rc_avpair_free(send); + end: + switch_thread_rwlock_unlock(globals.rwlock); return (retval); } @@ -680,6 +692,9 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_radius_cdr_load) { + + switch_thread_rwlock_create(&globals.rwlock, pool); + if (load_config() != SWITCH_STATUS_SUCCESS) { return SWITCH_STATUS_TERM; } @@ -699,6 +714,9 @@ globals.shutdown = 1; switch_core_remove_state_handler(&state_handlers); + switch_thread_rwlock_wrlock(globals.rwlock); + switch_thread_rwlock_unlock(globals.rwlock); + return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r10259 - freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr
by Freeswitch SVN 05 Nov '08

05 Nov '08

Author: anthm Date: Wed Nov 5 15:19:52 2008 New Revision: 10259 Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Log: fix MODEVENT-29 Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Wed Nov 5 15:19:52 2008 @@ -36,11 +36,11 @@ #include "mod_radius_cdr.h" SWITCH_MODULE_LOAD_FUNCTION(mod_radius_cdr_load); -SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_cdr_radius_shutdown); -SWITCH_MODULE_DEFINITION(mod_radius_cdr, mod_radius_cdr_load, mod_cdr_radius_shutdown, NULL); +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_radius_cdr_shutdown); +SWITCH_MODULE_DEFINITION(mod_radius_cdr, mod_radius_cdr_load, mod_radius_cdr_shutdown, NULL); static struct { - int shutdown + int shutdown; } globals = { 0 }; static char cf[] = "mod_radius_cdr.conf"; @@ -694,7 +694,7 @@ } -SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_radius_csv_shutdown) +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_radius_cdr_shutdown) { globals.shutdown = 1;

1 0

[commit] r10258 - freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr
by Freeswitch SVN 05 Nov '08

05 Nov '08

Author: anthm Date: Wed Nov 5 15:16:44 2008 New Revision: 10258 Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Log: google commit Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Wed Nov 5 15:16:44 2008 @@ -36,7 +36,12 @@ #include "mod_radius_cdr.h" SWITCH_MODULE_LOAD_FUNCTION(mod_radius_cdr_load); -SWITCH_MODULE_DEFINITION(mod_radius_cdr, mod_radius_cdr_load, NULL, NULL); +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_cdr_radius_shutdown); +SWITCH_MODULE_DEFINITION(mod_radius_cdr, mod_radius_cdr_load, mod_cdr_radius_shutdown, NULL); + +static struct { + int shutdown +} globals = { 0 }; static char cf[] = "mod_radius_cdr.conf"; static char my_dictionary[PATH_MAX]; @@ -368,6 +373,10 @@ switch_time_exp_t tm; char buffer[32] = ""; + if (globals.shutdown) { + return SWITCH_STATUS_FALSE; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[mod_radius_cdr] Entering my_on_hangup\n"); rad_config = my_radius_init(); @@ -684,6 +693,15 @@ return SWITCH_STATUS_SUCCESS; } + +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_radius_csv_shutdown) +{ + + globals.shutdown = 1; + switch_core_remove_state_handler(&state_handlers); + return SWITCH_STATUS_SUCCESS; +} + /* For Emacs: * Local Variables: * mode:c

1 0

[commit] r10257 - freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src
by Freeswitch SVN 05 Nov '08

05 Nov '08

Author: anthm Date: Wed Nov 5 13:29:18 2008 New Revision: 10257 Modified: freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_unix.c Log: compensate for strange socket bug in macos Modified: freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_unix.c ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_unix.c (original) +++ freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_unix.c Wed Nov 5 13:29:18 2008 @@ -77,6 +77,10 @@ static void termInterruptPipe(interruptPipe *pipeP) { if (pipeP->inuse) { + int x = 0; + write(pipeP->interruptorFd, &x, sizeof(x)); + usleep(500); + shutdown(pipeP->interrupteeFd, 2); sane_close(pipeP->interruptorFd); sane_close(pipeP->interrupteeFd); } @@ -310,6 +314,7 @@ rc = poll(pollfds, ARRAY_SIZE(pollfds), timeoutMs == TIME_INFINITE ? -1 : timeoutMs); + if (rc < 0) { if (errno == EINTR) { failed = FALSE;

1 0

[commit] r10256 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 05 Nov '08

05 Nov '08

Author: anthm Date: Wed Nov 5 13:22:36 2008 New Revision: 10256 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: udpate 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 Nov 5 13:22:36 2008 @@ -345,15 +345,15 @@ } 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='%s'", - reboot, call_id, user, host, mod_sofia_globals.hostname); + ",%d from sip_registrations where call_id='%s' or (sip_user='%s' and sip_host='%s')", + reboot, call_id, user, host); 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') and hostname='%s'", - call_id, user, host, mod_sofia_globals.hostname); + 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); sofia_glue_execute_sql(profile, &psql, SWITCH_FALSE); switch_safe_free(user); @@ -800,8 +800,8 @@ 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' and hostname='%q'", - to_user, reg_host, mod_sofia_globals.hostname); + sql = switch_mprintf("delete from sip_registrations where sip_user='%q' and sip_host='%q'", + to_user, reg_host); } switch_mutex_lock(profile->ireg_mutex); sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); @@ -880,13 +880,11 @@ switch_safe_free(icontact); } else { - 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))) { + if ((sql = switch_mprintf("delete from sip_subscriptions where sip_user='%q' and sip_host='%q'", to_user, reg_host))) { sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); } - 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))) { + if ((sql = switch_mprintf("delete from sip_registrations where sip_user='%q' and sip_host='%q'", to_user, reg_host))) { sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); } }

1 0

[commit] r10255 - in freeswitch/trunk/src/mod/languages/mod_managed: . managed
by Freeswitch SVN 05 Nov '08

05 Nov '08

Author: stkn Date: Wed Nov 5 13:08:04 2008 New Revision: 10255 Modified: freeswitch/trunk/src/mod/languages/mod_managed/Makefile freeswitch/trunk/src/mod/languages/mod_managed/managed/Makefile Log: Fix mod_managed staged install Modified: freeswitch/trunk/src/mod/languages/mod_managed/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/Makefile Wed Nov 5 13:08:04 2008 @@ -20,8 +20,8 @@ local_depend: cd managed && $(MAKE) -local_install: $(MODINSTDIR)/mod_managed.so - cd managed && $(MAKE) INSTALL="$(LTINSTALL)" MODINSTDIR=$(MODINSTDIR) install +local_install: $(DESTDIR)$(MODINSTDIR)/mod_managed.so + cd managed && $(MAKE) INSTALL="$(LTINSTALL)" MODINSTDIR=$(MODINSTDIR) DESTDIR=$(DESTDIR) install local_uninstall: rm -fr $(MODINSTDIR)/mod_managed.so Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/Makefile Wed Nov 5 13:08:04 2008 @@ -7,7 +7,7 @@ gmcs -target:library -out:mod_managed_lib.dll -d:DEBUG Loader.cs ManagedSession.cs ApiFunction.cs AppFunction.cs Extensions.cs Log.cs Demo.cs swig.cs install: mod_managed_lib.dll - $(INSTALL) mod_managed_lib.dll $(MODINSTDIR) + $(INSTALL) mod_managed_lib.dll $(DESTDIR)$(MODINSTDIR) uninstall: $(UNINSTALL) $(MODINSTDIR)/mod_managed_lib.dll

1 0

[commit] r10254 - freeswitch/trunk/scripts/contrib/mrene
by Freeswitch SVN 05 Nov '08

05 Nov '08

Author: mikej Date: Wed Nov 5 12:36:53 2008 New Revision: 10254 Added: freeswitch/trunk/scripts/contrib/mrene/ Log: add

1 0

[commit] r10253 - in freeswitch/trunk/src/mod/languages/mod_managed: . managed
by Freeswitch SVN 05 Nov '08

05 Nov '08

Author: anthm Date: Wed Nov 5 12:28:31 2008 New Revision: 10253 Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Log: swigall Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx Wed Nov 5 12:28:31 2008 @@ -4190,6 +4190,87 @@ } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message__file_set(void * jarg1, char * jarg2) { + switch_core_session_message *arg1 = (switch_core_session_message *) 0 ; + char *arg2 = (char *) 0 ; + + arg1 = (switch_core_session_message *)jarg1; + arg2 = (char *)jarg2; + { + if (arg2) { + arg1->_file = (char const *) (new char[strlen((const char *)arg2)+1]); + strcpy((char *)arg1->_file, (const char *)arg2); + } else { + arg1->_file = 0; + } + } +} + + +SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_session_message__file_get(void * jarg1) { + char * jresult ; + switch_core_session_message *arg1 = (switch_core_session_message *) 0 ; + char *result = 0 ; + + arg1 = (switch_core_session_message *)jarg1; + result = (char *) ((arg1)->_file); + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message__func_set(void * jarg1, char * jarg2) { + switch_core_session_message *arg1 = (switch_core_session_message *) 0 ; + char *arg2 = (char *) 0 ; + + arg1 = (switch_core_session_message *)jarg1; + arg2 = (char *)jarg2; + { + if (arg2) { + arg1->_func = (char const *) (new char[strlen((const char *)arg2)+1]); + strcpy((char *)arg1->_func, (const char *)arg2); + } else { + arg1->_func = 0; + } + } +} + + +SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_session_message__func_get(void * jarg1) { + char * jresult ; + switch_core_session_message *arg1 = (switch_core_session_message *) 0 ; + char *result = 0 ; + + arg1 = (switch_core_session_message *)jarg1; + result = (char *) ((arg1)->_func); + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message__line_set(void * jarg1, int jarg2) { + switch_core_session_message *arg1 = (switch_core_session_message *) 0 ; + int arg2 ; + + arg1 = (switch_core_session_message *)jarg1; + arg2 = (int)jarg2; + if (arg1) (arg1)->_line = arg2; + +} + + +SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_message__line_get(void * jarg1) { + int jresult ; + switch_core_session_message *arg1 = (switch_core_session_message *) 0 ; + int result; + + arg1 = (switch_core_session_message *)jarg1; + result = (int) ((arg1)->_line); + jresult = result; + return jresult; +} + + SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_core_session_message() { void * jresult ; switch_core_session_message *result = 0 ; @@ -4966,20 +5047,36 @@ } -SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_request(void * jarg1, void * jarg2) { +SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_request_uuid(void * jarg1, void * jarg2, char * jarg3) { void * jresult ; switch_endpoint_interface_t *arg1 = (switch_endpoint_interface_t *) 0 ; switch_memory_pool_t **arg2 = (switch_memory_pool_t **) 0 ; + char *arg3 = (char *) 0 ; switch_core_session_t *result = 0 ; arg1 = (switch_endpoint_interface_t *)jarg1; arg2 = (switch_memory_pool_t **)jarg2; - result = (switch_core_session_t *)switch_core_session_request((switch_endpoint_interface const *)arg1,arg2); + arg3 = (char *)jarg3; + result = (switch_core_session_t *)switch_core_session_request_uuid((switch_endpoint_interface const *)arg1,arg2,(char const *)arg3); jresult = (void *)result; return jresult; } +SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_set_uuid(void * jarg1, char * jarg2) { + int jresult ; + switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + char *arg2 = (char *) 0 ; + switch_status_t result; + + arg1 = (switch_core_session_t *)jarg1; + arg2 = (char *)jarg2; + result = (switch_status_t)switch_core_session_set_uuid(arg1,(char const *)arg2); + jresult = result; + return jresult; +} + + SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_perform_destroy(void * jarg1, char * jarg2, char * jarg3, int jarg4) { switch_core_session_t **arg1 = (switch_core_session_t **) 0 ; char *arg2 = (char *) 0 ; @@ -5474,15 +5571,21 @@ } -SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_receive_message(void * jarg1, void * jarg2) { +SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_perform_receive_message(void * jarg1, void * jarg2, char * jarg3, char * jarg4, int jarg5) { int jresult ; switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; switch_core_session_message_t *arg2 = (switch_core_session_message_t *) 0 ; + char *arg3 = (char *) 0 ; + char *arg4 = (char *) 0 ; + int arg5 ; switch_status_t result; arg1 = (switch_core_session_t *)jarg1; arg2 = (switch_core_session_message_t *)jarg2; - result = (switch_status_t)switch_core_session_receive_message(arg1,arg2); + arg3 = (char *)jarg3; + arg4 = (char *)jarg4; + arg5 = (int)jarg5; + result = (switch_status_t)switch_core_session_perform_receive_message(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5); jresult = result; return jresult; } @@ -5724,15 +5827,17 @@ } -SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_hash_init(void * jarg1, void * jarg2) { +SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_hash_init_case(void * jarg1, void * jarg2, int jarg3) { int jresult ; switch_hash_t **arg1 = (switch_hash_t **) 0 ; switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ; + switch_bool_t arg3 ; switch_status_t result; arg1 = (switch_hash_t **)jarg1; arg2 = (switch_memory_pool_t *)jarg2; - result = (switch_status_t)switch_core_hash_init(arg1,arg2); + arg3 = (switch_bool_t)jarg3; + result = (switch_status_t)switch_core_hash_init_case(arg1,arg2,arg3); jresult = result; return jresult; } @@ -7568,6 +7673,30 @@ } +SWIGEXPORT char * SWIGSTDCALL CSharp_switch_lc_strdup(char * jarg1) { + char * jresult ; + char *arg1 = (char *) 0 ; + char *result = 0 ; + + arg1 = (char *)jarg1; + result = (char *)switch_lc_strdup((char const *)arg1); + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + +SWIGEXPORT char * SWIGSTDCALL CSharp_switch_uc_strdup(char * jarg1) { + char * jresult ; + char *arg1 = (char *) 0 ; + char *result = 0 ; + + arg1 = (char *)jarg1; + result = (char *)switch_uc_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 ; @@ -17083,6 +17212,29 @@ } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_header_hash_set(void * jarg1, unsigned long jarg2) { + switch_event_header *arg1 = (switch_event_header *) 0 ; + unsigned long arg2 ; + + arg1 = (switch_event_header *)jarg1; + arg2 = (unsigned long)jarg2; + if (arg1) (arg1)->hash = arg2; + +} + + +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_event_header_hash_get(void * jarg1) { + unsigned long jresult ; + switch_event_header *arg1 = (switch_event_header *) 0 ; + unsigned long result; + + arg1 = (switch_event_header *)jarg1; + result = (unsigned long) ((arg1)->hash); + jresult = (unsigned long)result; + return jresult; +} + + SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_header_next_set(void * jarg1, void * jarg2) { switch_event_header *arg1 = (switch_event_header *) 0 ; switch_event_header *arg2 = (switch_event_header *) 0 ; Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Wed Nov 5 12:28:31 2008 @@ -1073,12 +1073,17 @@ return ret; } - public static SWIGTYPE_p_switch_core_session switch_core_session_request(switch_endpoint_interface endpoint_interface, SWIGTYPE_p_p_apr_pool_t pool) { - IntPtr cPtr = freeswitchPINVOKE.switch_core_session_request(switch_endpoint_interface.getCPtr(endpoint_interface), SWIGTYPE_p_p_apr_pool_t.getCPtr(pool)); + public static SWIGTYPE_p_switch_core_session switch_core_session_request_uuid(switch_endpoint_interface endpoint_interface, SWIGTYPE_p_p_apr_pool_t pool, string use_uuid) { + IntPtr cPtr = freeswitchPINVOKE.switch_core_session_request_uuid(switch_endpoint_interface.getCPtr(endpoint_interface), SWIGTYPE_p_p_apr_pool_t.getCPtr(pool), use_uuid); SWIGTYPE_p_switch_core_session ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_switch_core_session(cPtr, false); return ret; } + public static switch_status_t switch_core_session_set_uuid(SWIGTYPE_p_switch_core_session session, string use_uuid) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_set_uuid(SWIGTYPE_p_switch_core_session.getCPtr(session), use_uuid); + return ret; + } + public static void switch_core_session_perform_destroy(SWIGTYPE_p_p_switch_core_session session, string file, string func, int line) { freeswitchPINVOKE.switch_core_session_perform_destroy(SWIGTYPE_p_p_switch_core_session.getCPtr(session), file, func, line); } @@ -1270,8 +1275,8 @@ return ret; } - public static switch_status_t switch_core_session_receive_message(SWIGTYPE_p_switch_core_session session, switch_core_session_message message) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_receive_message(SWIGTYPE_p_switch_core_session.getCPtr(session), switch_core_session_message.getCPtr(message)); + public static switch_status_t switch_core_session_perform_receive_message(SWIGTYPE_p_switch_core_session session, switch_core_session_message message, string file, string func, int line) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_perform_receive_message(SWIGTYPE_p_switch_core_session.getCPtr(session), switch_core_session_message.getCPtr(message), file, func, line); return ret; } @@ -1354,8 +1359,8 @@ return ret; } - public static switch_status_t switch_core_hash_init(SWIGTYPE_p_p_switch_hash hash, SWIGTYPE_p_apr_pool_t pool) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_init(SWIGTYPE_p_p_switch_hash.getCPtr(hash), SWIGTYPE_p_apr_pool_t.getCPtr(pool)); + public static switch_status_t switch_core_hash_init_case(SWIGTYPE_p_p_switch_hash hash, SWIGTYPE_p_apr_pool_t pool, switch_bool_t case_sensitive) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_init_case(SWIGTYPE_p_p_switch_hash.getCPtr(hash), SWIGTYPE_p_apr_pool_t.getCPtr(pool), (int)case_sensitive); return ret; } @@ -1990,6 +1995,16 @@ return ret; } + public static string switch_lc_strdup(string it) { + string ret = freeswitchPINVOKE.switch_lc_strdup(it); + return ret; + } + + public static string switch_uc_strdup(string it) { + string ret = freeswitchPINVOKE.switch_uc_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; @@ -5151,6 +5166,24 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_message_flags_get")] public static extern uint switch_core_session_message_flags_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_message__file_set")] + public static extern void switch_core_session_message__file_set(HandleRef jarg1, string jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_message__file_get")] + public static extern string switch_core_session_message__file_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_message__func_set")] + public static extern void switch_core_session_message__func_set(HandleRef jarg1, string jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_message__func_get")] + public static extern string switch_core_session_message__func_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_message__line_set")] + public static extern void switch_core_session_message__line_set(HandleRef jarg1, int jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_message__line_get")] + public static extern int switch_core_session_message__line_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_new_switch_core_session_message")] public static extern IntPtr new_switch_core_session_message(); @@ -5328,8 +5361,11 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_get_pool")] public static extern IntPtr switch_core_session_get_pool(HandleRef jarg1); - [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_request")] - public static extern IntPtr switch_core_session_request(HandleRef jarg1, HandleRef jarg2); + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_request_uuid")] + public static extern IntPtr switch_core_session_request_uuid(HandleRef jarg1, HandleRef jarg2, string jarg3); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_set_uuid")] + public static extern int switch_core_session_set_uuid(HandleRef jarg1, string jarg2); [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_perform_destroy")] public static extern void switch_core_session_perform_destroy(HandleRef jarg1, string jarg2, string jarg3, int jarg4); @@ -5448,8 +5484,8 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_resurrect_channel")] public static extern int switch_core_session_resurrect_channel(string jarg1, HandleRef jarg2, HandleRef jarg3, HandleRef jarg4); - [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_receive_message")] - public static extern int switch_core_session_receive_message(HandleRef jarg1, HandleRef jarg2); + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_perform_receive_message")] + public static extern int switch_core_session_perform_receive_message(HandleRef jarg1, HandleRef jarg2, string jarg3, string jarg4, int jarg5); [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_queue_event")] public static extern int switch_core_session_queue_event(HandleRef jarg1, HandleRef jarg2); @@ -5499,8 +5535,8 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_recv_dtmf")] public static extern int switch_core_session_recv_dtmf(HandleRef jarg1, HandleRef jarg2); - [DllImport("mod_managed", EntryPoint="CSharp_switch_core_hash_init")] - public static extern int switch_core_hash_init(HandleRef jarg1, HandleRef jarg2); + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_hash_init_case")] + public static extern int switch_core_hash_init_case(HandleRef jarg1, HandleRef jarg2, int jarg3); [DllImport("mod_managed", EntryPoint="CSharp_switch_core_hash_destroy")] public static extern int switch_core_hash_destroy(HandleRef jarg1); @@ -5889,6 +5925,12 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_safe_strdup")] public static extern string switch_safe_strdup(string jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_lc_strdup")] + public static extern string switch_lc_strdup(string jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_uc_strdup")] + public static extern string switch_uc_strdup(string jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_strstr")] public static extern int switch_strstr(string jarg1, string jarg2); @@ -8196,6 +8238,12 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_event_header_value_get")] public static extern string switch_event_header_value_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_event_header_hash_set")] + public static extern void switch_event_header_hash_set(HandleRef jarg1, uint jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_event_header_hash_get")] + public static extern uint switch_event_header_hash_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_event_header_next_set")] public static extern void switch_event_header_next_set(HandleRef jarg1, HandleRef jarg2); @@ -17608,6 +17656,36 @@ } } + public string _file { + set { + freeswitchPINVOKE.switch_core_session_message__file_set(swigCPtr, value); + } + get { + string ret = freeswitchPINVOKE.switch_core_session_message__file_get(swigCPtr); + return ret; + } + } + + public string _func { + set { + freeswitchPINVOKE.switch_core_session_message__func_set(swigCPtr, value); + } + get { + string ret = freeswitchPINVOKE.switch_core_session_message__func_get(swigCPtr); + return ret; + } + } + + public int _line { + set { + freeswitchPINVOKE.switch_core_session_message__line_set(swigCPtr, value); + } + get { + int ret = freeswitchPINVOKE.switch_core_session_message__line_get(swigCPtr); + return ret; + } + } + public switch_core_session_message() : this(freeswitchPINVOKE.new_switch_core_session_message(), true) { } @@ -17659,7 +17737,8 @@ SWITCH_MESSAGE_INDICATE_DEFLECT, SWITCH_MESSAGE_INDICATE_VIDEO_REFRESH_REQ, SWITCH_MESSAGE_INDICATE_DISPLAY, - SWITCH_MESSAGE_INDICATE_TRANSCODING_NECESSARY + SWITCH_MESSAGE_INDICATE_TRANSCODING_NECESSARY, + SWITCH_MESSAGE_INVALID } } @@ -18792,6 +18871,16 @@ } } + public uint hash { + set { + freeswitchPINVOKE.switch_event_header_hash_set(swigCPtr, value); + } + get { + uint ret = freeswitchPINVOKE.switch_event_header_hash_get(swigCPtr); + return ret; + } + } + public switch_event_header next { set { freeswitchPINVOKE.switch_event_header_next_set(swigCPtr, switch_event_header.getCPtr(value)); @@ -18837,6 +18926,7 @@ SWITCH_EVENT_CHANNEL_UNPARK, SWITCH_EVENT_CHANNEL_APPLICATION, SWITCH_EVENT_CHANNEL_ORIGINATE, + SWITCH_EVENT_CHANNEL_UUID, SWITCH_EVENT_API, SWITCH_EVENT_LOG, SWITCH_EVENT_INBOUND_CHAN,

1 0

[commit] r10252 - in freeswitch/trunk/src/mod/applications: mod_commands mod_dptools
by Freeswitch SVN 05 Nov '08

05 Nov '08

Author: anthm Date: Wed Nov 5 12:25:54 2008 New Revision: 10252 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: add flush_dtmf app and uuid_flush_dtmf api command Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Wed Nov 5 12:25:54 2008 @@ -2477,6 +2477,21 @@ } +SWITCH_STANDARD_API(uuid_flush_dtmf_function) +{ + switch_core_session_t *fsession; + + if (!switch_strlen_zero(cmd) && (fsession = switch_core_session_locate(cmd))) { + switch_channel_flush_dtmf(switch_core_session_get_channel(fsession)); + switch_core_session_rwunlock(fsession); + stream->write_function(stream, "+OK\n"); + } else { + stream->write_function(stream, "-ERR no such session\n"); + } + + return SWITCH_STATUS_SUCCESS; +} + #define SETVAR_SYNTAX "<uuid> <var> <value>" SWITCH_STANDARD_API(uuid_setvar_function) { @@ -2815,6 +2830,7 @@ switch_api_interface_t *commands_api_interface; *module_interface = switch_loadable_module_create_module_interface(pool, modname); + SWITCH_ADD_API(commands_api_interface, "uuid_flush_dtmf", "Flush dtmf on a given uuid", uuid_flush_dtmf_function, "<uuid>"); SWITCH_ADD_API(commands_api_interface, "md5", "md5", md5_function, "<data>"); SWITCH_ADD_API(commands_api_interface, "hupall", "hupall", hupall_api_function, "<cause> [<var> <value>]"); SWITCH_ADD_API(commands_api_interface, "strftime_tz", "strftime_tz", strftime_tz_api_function, "<Timezone_name> [format string]"); Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Wed Nov 5 12:25:54 2008 @@ -411,6 +411,11 @@ } +SWITCH_STANDARD_APP(flush_dtmf_function) +{ + switch_channel_flush_dtmf(switch_core_session_get_channel(session)); +} + SWITCH_STANDARD_APP(transfer_function) { int argc; @@ -2279,6 +2284,7 @@ SWITCH_ADD_APP(app_interface, "privacy", "Set privacy on calls", "Set caller privacy on calls.", privacy_function, "off|on|name|full|number", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "flush_dtmf", "flush any queued dtmf", "flush any queued dtmf", flush_dtmf_function, "", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "hold", "Send a hold message", "Send a hold message", hold_function, HOLD_SYNTAX, SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "unhold", "Send a un-hold message", "Send a un-hold message", unhold_function, UNHOLD_SYNTAX, SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "transfer", "Transfer a channel", TRANSFER_LONG_DESC, transfer_function, "<exten> [<dialplan> <context>]",

1 0