- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r6839 - freeswitch/trunk/conf/directory/default
by Freeswitch SVN 17 Dec '07

17 Dec '07

Author: brian Date: Mon Dec 17 12:59:12 2007 New Revision: 6839 Modified: freeswitch/trunk/conf/directory/default/1000.xml freeswitch/trunk/conf/directory/default/1001.xml freeswitch/trunk/conf/directory/default/1002.xml freeswitch/trunk/conf/directory/default/1003.xml freeswitch/trunk/conf/directory/default/1004.xml freeswitch/trunk/conf/directory/default/1005.xml freeswitch/trunk/conf/directory/default/1006.xml freeswitch/trunk/conf/directory/default/1007.xml freeswitch/trunk/conf/directory/default/1008.xml freeswitch/trunk/conf/directory/default/1009.xml freeswitch/trunk/conf/directory/default/1010.xml freeswitch/trunk/conf/directory/default/1011.xml freeswitch/trunk/conf/directory/default/1012.xml freeswitch/trunk/conf/directory/default/1013.xml freeswitch/trunk/conf/directory/default/1014.xml freeswitch/trunk/conf/directory/default/1015.xml freeswitch/trunk/conf/directory/default/1016.xml freeswitch/trunk/conf/directory/default/1017.xml freeswitch/trunk/conf/directory/default/1018.xml freeswitch/trunk/conf/directory/default/1019.xml Log: remove this Modified: freeswitch/trunk/conf/directory/default/1000.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1000.xml (original) +++ freeswitch/trunk/conf/directory/default/1000.xml Mon Dec 17 12:59:12 2007 @@ -6,7 +6,6 @@ </params> <variables> <variable name="accountcode" value="1000"/> - <variable name="presence_id" value="1000@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1000"/> <variable name="effective_caller_id_number" value="1000"/> Modified: freeswitch/trunk/conf/directory/default/1001.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1001.xml (original) +++ freeswitch/trunk/conf/directory/default/1001.xml Mon Dec 17 12:59:12 2007 @@ -6,7 +6,6 @@ </params> <variables> <variable name="accountcode" value="1001"/> - <variable name="presence_id" value="1001@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1001"/> <variable name="effective_caller_id_number" value="1001"/> Modified: freeswitch/trunk/conf/directory/default/1002.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1002.xml (original) +++ freeswitch/trunk/conf/directory/default/1002.xml Mon Dec 17 12:59:12 2007 @@ -6,7 +6,6 @@ </params> <variables> <variable name="accountcode" value="1002"/> - <variable name="presence_id" value="1002@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1002"/> <variable name="effective_caller_id_number" value="1002"/> Modified: freeswitch/trunk/conf/directory/default/1003.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1003.xml (original) +++ freeswitch/trunk/conf/directory/default/1003.xml Mon Dec 17 12:59:12 2007 @@ -6,7 +6,6 @@ </params> <variables> <variable name="accountcode" value="1003"/> - <variable name="presence_id" value="1003@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1003"/> <variable name="effective_caller_id_number" value="1003"/> Modified: freeswitch/trunk/conf/directory/default/1004.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1004.xml (original) +++ freeswitch/trunk/conf/directory/default/1004.xml Mon Dec 17 12:59:12 2007 @@ -6,7 +6,6 @@ </params> <variables> <variable name="accountcode" value="1004"/> - <variable name="presence_id" value="1004@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1004"/> <variable name="effective_caller_id_number" value="1004"/> Modified: freeswitch/trunk/conf/directory/default/1005.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1005.xml (original) +++ freeswitch/trunk/conf/directory/default/1005.xml Mon Dec 17 12:59:12 2007 @@ -6,7 +6,6 @@ </params> <variables> <variable name="accountcode" value="1005"/> - <variable name="presence_id" value="1005@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1005"/> <variable name="effective_caller_id_number" value="1005"/> Modified: freeswitch/trunk/conf/directory/default/1006.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1006.xml (original) +++ freeswitch/trunk/conf/directory/default/1006.xml Mon Dec 17 12:59:12 2007 @@ -6,7 +6,6 @@ </params> <variables> <variable name="accountcode" value="1006"/> - <variable name="presence_id" value="1006@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1006"/> <variable name="effective_caller_id_number" value="1006"/> Modified: freeswitch/trunk/conf/directory/default/1007.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1007.xml (original) +++ freeswitch/trunk/conf/directory/default/1007.xml Mon Dec 17 12:59:12 2007 @@ -6,7 +6,6 @@ </params> <variables> <variable name="accountcode" value="1007"/> - <variable name="presence_id" value="1007@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1007"/> <variable name="effective_caller_id_number" value="1007"/> Modified: freeswitch/trunk/conf/directory/default/1008.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1008.xml (original) +++ freeswitch/trunk/conf/directory/default/1008.xml Mon Dec 17 12:59:12 2007 @@ -6,7 +6,6 @@ </params> <variables> <variable name="accountcode" value="1008"/> - <variable name="presence_id" value="1008@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1008"/> <variable name="effective_caller_id_number" value="1008"/> Modified: freeswitch/trunk/conf/directory/default/1009.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1009.xml (original) +++ freeswitch/trunk/conf/directory/default/1009.xml Mon Dec 17 12:59:12 2007 @@ -6,7 +6,6 @@ </params> <variables> <variable name="accountcode" value="1009"/> - <variable name="presence_id" value="1009@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1009"/> <variable name="effective_caller_id_number" value="1009"/> Modified: freeswitch/trunk/conf/directory/default/1010.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1010.xml (original) +++ freeswitch/trunk/conf/directory/default/1010.xml Mon Dec 17 12:59:12 2007 @@ -6,7 +6,6 @@ </params> <variables> <variable name="accountcode" value="1010"/> - <variable name="presence_id" value="1010@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1010"/> <variable name="effective_caller_id_number" value="1010"/> Modified: freeswitch/trunk/conf/directory/default/1011.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1011.xml (original) +++ freeswitch/trunk/conf/directory/default/1011.xml Mon Dec 17 12:59:12 2007 @@ -6,7 +6,6 @@ </params> <variables> <variable name="accountcode" value="1011"/> - <variable name="presence_id" value="1011@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1011"/> <variable name="effective_caller_id_number" value="1011"/> Modified: freeswitch/trunk/conf/directory/default/1012.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1012.xml (original) +++ freeswitch/trunk/conf/directory/default/1012.xml Mon Dec 17 12:59:12 2007 @@ -6,7 +6,6 @@ </params> <variables> <variable name="accountcode" value="1012"/> - <variable name="presence_id" value="1012@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1012"/> <variable name="effective_caller_id_number" value="1012"/> Modified: freeswitch/trunk/conf/directory/default/1013.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1013.xml (original) +++ freeswitch/trunk/conf/directory/default/1013.xml Mon Dec 17 12:59:12 2007 @@ -6,7 +6,6 @@ </params> <variables> <variable name="accountcode" value="1013"/> - <variable name="presence_id" value="1013@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1013"/> <variable name="effective_caller_id_number" value="1013"/> Modified: freeswitch/trunk/conf/directory/default/1014.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1014.xml (original) +++ freeswitch/trunk/conf/directory/default/1014.xml Mon Dec 17 12:59:12 2007 @@ -6,7 +6,6 @@ </params> <variables> <variable name="accountcode" value="1014"/> - <variable name="presence_id" value="1014@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1014"/> <variable name="effective_caller_id_number" value="1014"/> Modified: freeswitch/trunk/conf/directory/default/1015.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1015.xml (original) +++ freeswitch/trunk/conf/directory/default/1015.xml Mon Dec 17 12:59:12 2007 @@ -6,7 +6,6 @@ </params> <variables> <variable name="accountcode" value="1015"/> - <variable name="presence_id" value="1015@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1015"/> <variable name="effective_caller_id_number" value="1015"/> Modified: freeswitch/trunk/conf/directory/default/1016.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1016.xml (original) +++ freeswitch/trunk/conf/directory/default/1016.xml Mon Dec 17 12:59:12 2007 @@ -6,7 +6,6 @@ </params> <variables> <variable name="accountcode" value="1016"/> - <variable name="presence_id" value="1016@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1016"/> <variable name="effective_caller_id_number" value="1016"/> Modified: freeswitch/trunk/conf/directory/default/1017.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1017.xml (original) +++ freeswitch/trunk/conf/directory/default/1017.xml Mon Dec 17 12:59:12 2007 @@ -6,7 +6,6 @@ </params> <variables> <variable name="accountcode" value="1017"/> - <variable name="presence_id" value="1017@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1017"/> <variable name="effective_caller_id_number" value="1017"/> Modified: freeswitch/trunk/conf/directory/default/1018.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1018.xml (original) +++ freeswitch/trunk/conf/directory/default/1018.xml Mon Dec 17 12:59:12 2007 @@ -6,7 +6,6 @@ </params> <variables> <variable name="accountcode" value="1018"/> - <variable name="presence_id" value="1018@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1018"/> <variable name="effective_caller_id_number" value="1018"/> Modified: freeswitch/trunk/conf/directory/default/1019.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1019.xml (original) +++ freeswitch/trunk/conf/directory/default/1019.xml Mon Dec 17 12:59:12 2007 @@ -6,7 +6,6 @@ </params> <variables> <variable name="accountcode" value="1019"/> - <variable name="presence_id" value="1019@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1019"/> <variable name="effective_caller_id_number" value="1019"/>

1 0

[commit] r6838 - freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv
by Freeswitch SVN 17 Dec '07

17 Dec '07

Author: anthm Date: Mon Dec 17 12:48:13 2007 New Revision: 6838 Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Log: tweak for MODEVENT-6 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 Mon Dec 17 12:48:13 2007 @@ -146,7 +146,7 @@ } if ((bytes_in = write(fd->fd, log_line, bytes_out)) != bytes_out) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Write error to file %s\n", path); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Write error to file %s %d/%d\n", path, (int)bytes_in, (int)bytes_out); } fd->bytes += bytes_in; switch_mutex_unlock(fd->mutex); @@ -337,7 +337,9 @@ for (hi = switch_hash_first(NULL, globals.fd_hash); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, NULL, NULL, &val); fd = (cdr_fd_t *) val; + switch_mutex_lock(fd->mutex); do_rotate(fd); + switch_mutex_unlock(fd->mutex); } } }

1 0

[commit] r6833 - freeswitch/trunk/conf/directory/default
by Freeswitch SVN 17 Dec '07

17 Dec '07

Author: brian Date: Sun Dec 16 23:07:35 2007 New Revision: 6833 Modified: freeswitch/trunk/conf/directory/default/1000.xml freeswitch/trunk/conf/directory/default/1001.xml freeswitch/trunk/conf/directory/default/1002.xml freeswitch/trunk/conf/directory/default/1003.xml freeswitch/trunk/conf/directory/default/1004.xml freeswitch/trunk/conf/directory/default/1005.xml freeswitch/trunk/conf/directory/default/1006.xml freeswitch/trunk/conf/directory/default/1007.xml freeswitch/trunk/conf/directory/default/1008.xml freeswitch/trunk/conf/directory/default/1009.xml freeswitch/trunk/conf/directory/default/1010.xml freeswitch/trunk/conf/directory/default/1011.xml freeswitch/trunk/conf/directory/default/1012.xml freeswitch/trunk/conf/directory/default/1013.xml freeswitch/trunk/conf/directory/default/1014.xml freeswitch/trunk/conf/directory/default/1015.xml freeswitch/trunk/conf/directory/default/1016.xml freeswitch/trunk/conf/directory/default/1017.xml freeswitch/trunk/conf/directory/default/1018.xml freeswitch/trunk/conf/directory/default/1019.xml Log: add more to default useres Modified: freeswitch/trunk/conf/directory/default/1000.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1000.xml (original) +++ freeswitch/trunk/conf/directory/default/1000.xml Sun Dec 16 23:07:35 2007 @@ -2,6 +2,7 @@ <user id="1000" mailbox="1000"> <params> <param name="password" value="1234"/> + <param name="vm-password" value="1000"/> </params> <variables> <variable name="accountcode" value="1000"/> Modified: freeswitch/trunk/conf/directory/default/1001.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1001.xml (original) +++ freeswitch/trunk/conf/directory/default/1001.xml Sun Dec 16 23:07:35 2007 @@ -2,6 +2,7 @@ <user id="1001" mailbox="1001"> <params> <param name="password" value="1234"/> + <param name="vm-password" value="1001"/> </params> <variables> <variable name="accountcode" value="1001"/> Modified: freeswitch/trunk/conf/directory/default/1002.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1002.xml (original) +++ freeswitch/trunk/conf/directory/default/1002.xml Sun Dec 16 23:07:35 2007 @@ -2,6 +2,7 @@ <user id="1002" mailbox="1002"> <params> <param name="password" value="1234"/> + <param name="vm-password" value="1002"/> </params> <variables> <variable name="accountcode" value="1002"/> Modified: freeswitch/trunk/conf/directory/default/1003.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1003.xml (original) +++ freeswitch/trunk/conf/directory/default/1003.xml Sun Dec 16 23:07:35 2007 @@ -2,6 +2,7 @@ <user id="1003" mailbox="1003"> <params> <param name="password" value="1234"/> + <param name="vm-password" value="1003"/> </params> <variables> <variable name="accountcode" value="1003"/> Modified: freeswitch/trunk/conf/directory/default/1004.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1004.xml (original) +++ freeswitch/trunk/conf/directory/default/1004.xml Sun Dec 16 23:07:35 2007 @@ -2,6 +2,7 @@ <user id="1004" mailbox="1004"> <params> <param name="password" value="1234"/> + <param name="vm-password" value="1004"/> </params> <variables> <variable name="accountcode" value="1004"/> Modified: freeswitch/trunk/conf/directory/default/1005.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1005.xml (original) +++ freeswitch/trunk/conf/directory/default/1005.xml Sun Dec 16 23:07:35 2007 @@ -2,6 +2,7 @@ <user id="1005" mailbox="1005"> <params> <param name="password" value="1234"/> + <param name="vm-password" value="1005"/> </params> <variables> <variable name="accountcode" value="1005"/> Modified: freeswitch/trunk/conf/directory/default/1006.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1006.xml (original) +++ freeswitch/trunk/conf/directory/default/1006.xml Sun Dec 16 23:07:35 2007 @@ -2,6 +2,7 @@ <user id="1006" mailbox="1006"> <params> <param name="password" value="1234"/> + <param name="vm-password" value="1006"/> </params> <variables> <variable name="accountcode" value="1006"/> Modified: freeswitch/trunk/conf/directory/default/1007.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1007.xml (original) +++ freeswitch/trunk/conf/directory/default/1007.xml Sun Dec 16 23:07:35 2007 @@ -2,6 +2,7 @@ <user id="1007" mailbox="1007"> <params> <param name="password" value="1234"/> + <param name="vm-password" value="1007"/> </params> <variables> <variable name="accountcode" value="1007"/> Modified: freeswitch/trunk/conf/directory/default/1008.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1008.xml (original) +++ freeswitch/trunk/conf/directory/default/1008.xml Sun Dec 16 23:07:35 2007 @@ -2,6 +2,7 @@ <user id="1008" mailbox="1008"> <params> <param name="password" value="1234"/> + <param name="vm-password" value="1008"/> </params> <variables> <variable name="accountcode" value="1008"/> Modified: freeswitch/trunk/conf/directory/default/1009.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1009.xml (original) +++ freeswitch/trunk/conf/directory/default/1009.xml Sun Dec 16 23:07:35 2007 @@ -2,6 +2,7 @@ <user id="1009" mailbox="1009"> <params> <param name="password" value="1234"/> + <param name="vm-password" value="1009"/> </params> <variables> <variable name="accountcode" value="1009"/> Modified: freeswitch/trunk/conf/directory/default/1010.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1010.xml (original) +++ freeswitch/trunk/conf/directory/default/1010.xml Sun Dec 16 23:07:35 2007 @@ -2,6 +2,7 @@ <user id="1010" mailbox="1010"> <params> <param name="password" value="1234"/> + <param name="vm-password" value="1010"/> </params> <variables> <variable name="accountcode" value="1010"/> Modified: freeswitch/trunk/conf/directory/default/1011.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1011.xml (original) +++ freeswitch/trunk/conf/directory/default/1011.xml Sun Dec 16 23:07:35 2007 @@ -2,6 +2,7 @@ <user id="1011" mailbox="1011"> <params> <param name="password" value="1234"/> + <param name="vm-password" value="1011"/> </params> <variables> <variable name="accountcode" value="1011"/> Modified: freeswitch/trunk/conf/directory/default/1012.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1012.xml (original) +++ freeswitch/trunk/conf/directory/default/1012.xml Sun Dec 16 23:07:35 2007 @@ -2,6 +2,7 @@ <user id="1012" mailbox="1012"> <params> <param name="password" value="1234"/> + <param name="vm-password" value="1012"/> </params> <variables> <variable name="accountcode" value="1012"/> Modified: freeswitch/trunk/conf/directory/default/1013.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1013.xml (original) +++ freeswitch/trunk/conf/directory/default/1013.xml Sun Dec 16 23:07:35 2007 @@ -2,6 +2,7 @@ <user id="1013" mailbox="1013"> <params> <param name="password" value="1234"/> + <param name="vm-password" value="1013"/> </params> <variables> <variable name="accountcode" value="1013"/> Modified: freeswitch/trunk/conf/directory/default/1014.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1014.xml (original) +++ freeswitch/trunk/conf/directory/default/1014.xml Sun Dec 16 23:07:35 2007 @@ -2,6 +2,7 @@ <user id="1014" mailbox="1014"> <params> <param name="password" value="1234"/> + <param name="vm-password" value="1014"/> </params> <variables> <variable name="accountcode" value="1014"/> Modified: freeswitch/trunk/conf/directory/default/1015.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1015.xml (original) +++ freeswitch/trunk/conf/directory/default/1015.xml Sun Dec 16 23:07:35 2007 @@ -2,6 +2,7 @@ <user id="1015" mailbox="1015"> <params> <param name="password" value="1234"/> + <param name="vm-password" value="1015"/> </params> <variables> <variable name="accountcode" value="1015"/> Modified: freeswitch/trunk/conf/directory/default/1016.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1016.xml (original) +++ freeswitch/trunk/conf/directory/default/1016.xml Sun Dec 16 23:07:35 2007 @@ -2,6 +2,7 @@ <user id="1016" mailbox="1016"> <params> <param name="password" value="1234"/> + <param name="vm-password" value="1016"/> </params> <variables> <variable name="accountcode" value="1016"/> Modified: freeswitch/trunk/conf/directory/default/1017.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1017.xml (original) +++ freeswitch/trunk/conf/directory/default/1017.xml Sun Dec 16 23:07:35 2007 @@ -2,6 +2,7 @@ <user id="1017" mailbox="1017"> <params> <param name="password" value="1234"/> + <param name="vm-password" value="1017"/> </params> <variables> <variable name="accountcode" value="1017"/> Modified: freeswitch/trunk/conf/directory/default/1018.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1018.xml (original) +++ freeswitch/trunk/conf/directory/default/1018.xml Sun Dec 16 23:07:35 2007 @@ -2,6 +2,7 @@ <user id="1018" mailbox="1018"> <params> <param name="password" value="1234"/> + <param name="vm-password" value="1018"/> </params> <variables> <variable name="accountcode" value="1018"/> Modified: freeswitch/trunk/conf/directory/default/1019.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1019.xml (original) +++ freeswitch/trunk/conf/directory/default/1019.xml Sun Dec 16 23:07:35 2007 @@ -2,6 +2,7 @@ <user id="1019" mailbox="1019"> <params> <param name="password" value="1234"/> + <param name="vm-password" value="1019"/> </params> <variables> <variable name="accountcode" value="1019"/>

1 0

[commit] r6832 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 17 Dec '07

17 Dec '07

Author: brian Date: Sun Dec 16 23:02:02 2007 New Revision: 6832 Modified: freeswitch/trunk/conf/autoload_configs/cdr_csv.conf.xml Log: add debug and read and write codec to the example cdr template Modified: freeswitch/trunk/conf/autoload_configs/cdr_csv.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/cdr_csv.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/cdr_csv.conf.xml Sun Dec 16 23:02:02 2007 @@ -3,11 +3,13 @@   <param name="default-template" value="example"/> +  +  <param name="rotate-on-hup" value="true"/> </settings> <templates> <template name="sql">INSERT INTO cdr VALUES ("${caller_id_name}","${caller_id_number}","${destination_number}","${context}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${uuid}","${bleg_uuid}", "${accountcode}");</template> - <template name="example">"${caller_id_name}","${caller_id_number}","${destination_number}","${context}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${uuid}","${bleg_uuid}", "${accountcode}"</template> + <template name="example">"${caller_id_name}","${caller_id_number}","${destination_number}","${context}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${uuid}","${bleg_uuid}", "${accountcode}","${read_codec}","${write_codec}"</template> <template name="asterisk">"${accountcode}","${caller_id_number}","${destination_number}","${context}","${caller_id}","${channel_name}","${bridge_channel}","${last_app}","${last_arg}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${amaflags}","${uuid}","${userfield}"</template> </templates> </configuration>

1 0

[commit] r6831 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 17 Dec '07

17 Dec '07

Author: brian Date: Sun Dec 16 19:20:38 2007 New Revision: 6831 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: diaplan fix. Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Sun Dec 16 19:20:38 2007 @@ -111,7 +111,7 @@ <action application="answer"/> <action application="sleep" data="1000"/> <action application="voicemail" data="check default $${domain} ${dialed_ext}"/> - <anti-action application="set" data="call_timeout=30000"/> + <anti-action application="set" data="call_timeout=30"/> <anti-action application="set" data="hangup_after_bridge=true"/> <anti-action application="set" data="continue_on_fail=true"/> <anti-action application="db" data="insert/call_return/${dialed_ext}/${caller_id_number}"/>

1 0

[commit] r6830 - freeswitch/trunk/conf/directory/default
by Freeswitch SVN 16 Dec '07

16 Dec '07

Author: brian Date: Sun Dec 16 14:11:13 2007 New Revision: 6830 Modified: freeswitch/trunk/conf/directory/default/1000.xml freeswitch/trunk/conf/directory/default/1001.xml freeswitch/trunk/conf/directory/default/1002.xml freeswitch/trunk/conf/directory/default/1003.xml freeswitch/trunk/conf/directory/default/1004.xml freeswitch/trunk/conf/directory/default/1005.xml freeswitch/trunk/conf/directory/default/1006.xml freeswitch/trunk/conf/directory/default/1007.xml freeswitch/trunk/conf/directory/default/1008.xml freeswitch/trunk/conf/directory/default/1009.xml freeswitch/trunk/conf/directory/default/1010.xml freeswitch/trunk/conf/directory/default/1011.xml freeswitch/trunk/conf/directory/default/1012.xml freeswitch/trunk/conf/directory/default/1013.xml freeswitch/trunk/conf/directory/default/1014.xml freeswitch/trunk/conf/directory/default/1015.xml freeswitch/trunk/conf/directory/default/1016.xml freeswitch/trunk/conf/directory/default/1017.xml freeswitch/trunk/conf/directory/default/1018.xml freeswitch/trunk/conf/directory/default/1019.xml Log: adding info Modified: freeswitch/trunk/conf/directory/default/1000.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1000.xml (original) +++ freeswitch/trunk/conf/directory/default/1000.xml Sun Dec 16 14:11:13 2007 @@ -1,14 +1,13 @@ <include> <user id="1000" mailbox="1000"> <params> - <param name="password" value="mypass"/> - <param name="vm-password" value="1234"/> -  -  + <param name="password" value="1234"/> </params> <variables> + <variable name="accountcode" value="1000"/> + <variable name="presence_id" value="1000@$${domain}"/> <variable name="user_context" value="default"/> - <variable name="effective_caller_id_name" value="Brian West"/> + <variable name="effective_caller_id_name" value="Extension 1000"/> <variable name="effective_caller_id_number" value="1000"/> </variables> </user> Modified: freeswitch/trunk/conf/directory/default/1001.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1001.xml (original) +++ freeswitch/trunk/conf/directory/default/1001.xml Sun Dec 16 14:11:13 2007 @@ -4,6 +4,8 @@ <param name="password" value="1234"/> </params> <variables> + <variable name="accountcode" value="1001"/> + <variable name="presence_id" value="1001@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1001"/> <variable name="effective_caller_id_number" value="1001"/> Modified: freeswitch/trunk/conf/directory/default/1002.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1002.xml (original) +++ freeswitch/trunk/conf/directory/default/1002.xml Sun Dec 16 14:11:13 2007 @@ -4,6 +4,8 @@ <param name="password" value="1234"/> </params> <variables> + <variable name="accountcode" value="1002"/> + <variable name="presence_id" value="1002@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1002"/> <variable name="effective_caller_id_number" value="1002"/> Modified: freeswitch/trunk/conf/directory/default/1003.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1003.xml (original) +++ freeswitch/trunk/conf/directory/default/1003.xml Sun Dec 16 14:11:13 2007 @@ -4,6 +4,8 @@ <param name="password" value="1234"/> </params> <variables> + <variable name="accountcode" value="1003"/> + <variable name="presence_id" value="1003@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1003"/> <variable name="effective_caller_id_number" value="1003"/> Modified: freeswitch/trunk/conf/directory/default/1004.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1004.xml (original) +++ freeswitch/trunk/conf/directory/default/1004.xml Sun Dec 16 14:11:13 2007 @@ -4,6 +4,8 @@ <param name="password" value="1234"/> </params> <variables> + <variable name="accountcode" value="1004"/> + <variable name="presence_id" value="1004@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1004"/> <variable name="effective_caller_id_number" value="1004"/> Modified: freeswitch/trunk/conf/directory/default/1005.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1005.xml (original) +++ freeswitch/trunk/conf/directory/default/1005.xml Sun Dec 16 14:11:13 2007 @@ -4,6 +4,8 @@ <param name="password" value="1234"/> </params> <variables> + <variable name="accountcode" value="1005"/> + <variable name="presence_id" value="1005@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1005"/> <variable name="effective_caller_id_number" value="1005"/> Modified: freeswitch/trunk/conf/directory/default/1006.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1006.xml (original) +++ freeswitch/trunk/conf/directory/default/1006.xml Sun Dec 16 14:11:13 2007 @@ -4,6 +4,8 @@ <param name="password" value="1234"/> </params> <variables> + <variable name="accountcode" value="1006"/> + <variable name="presence_id" value="1006@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1006"/> <variable name="effective_caller_id_number" value="1006"/> Modified: freeswitch/trunk/conf/directory/default/1007.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1007.xml (original) +++ freeswitch/trunk/conf/directory/default/1007.xml Sun Dec 16 14:11:13 2007 @@ -4,6 +4,8 @@ <param name="password" value="1234"/> </params> <variables> + <variable name="accountcode" value="1007"/> + <variable name="presence_id" value="1007@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1007"/> <variable name="effective_caller_id_number" value="1007"/> Modified: freeswitch/trunk/conf/directory/default/1008.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1008.xml (original) +++ freeswitch/trunk/conf/directory/default/1008.xml Sun Dec 16 14:11:13 2007 @@ -4,6 +4,8 @@ <param name="password" value="1234"/> </params> <variables> + <variable name="accountcode" value="1008"/> + <variable name="presence_id" value="1008@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1008"/> <variable name="effective_caller_id_number" value="1008"/> Modified: freeswitch/trunk/conf/directory/default/1009.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1009.xml (original) +++ freeswitch/trunk/conf/directory/default/1009.xml Sun Dec 16 14:11:13 2007 @@ -4,6 +4,8 @@ <param name="password" value="1234"/> </params> <variables> + <variable name="accountcode" value="1009"/> + <variable name="presence_id" value="1009@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1009"/> <variable name="effective_caller_id_number" value="1009"/> Modified: freeswitch/trunk/conf/directory/default/1010.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1010.xml (original) +++ freeswitch/trunk/conf/directory/default/1010.xml Sun Dec 16 14:11:13 2007 @@ -4,6 +4,8 @@ <param name="password" value="1234"/> </params> <variables> + <variable name="accountcode" value="1010"/> + <variable name="presence_id" value="1010@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1010"/> <variable name="effective_caller_id_number" value="1010"/> Modified: freeswitch/trunk/conf/directory/default/1011.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1011.xml (original) +++ freeswitch/trunk/conf/directory/default/1011.xml Sun Dec 16 14:11:13 2007 @@ -4,6 +4,8 @@ <param name="password" value="1234"/> </params> <variables> + <variable name="accountcode" value="1011"/> + <variable name="presence_id" value="1011@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1011"/> <variable name="effective_caller_id_number" value="1011"/> Modified: freeswitch/trunk/conf/directory/default/1012.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1012.xml (original) +++ freeswitch/trunk/conf/directory/default/1012.xml Sun Dec 16 14:11:13 2007 @@ -4,6 +4,8 @@ <param name="password" value="1234"/> </params> <variables> + <variable name="accountcode" value="1012"/> + <variable name="presence_id" value="1012@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1012"/> <variable name="effective_caller_id_number" value="1012"/> Modified: freeswitch/trunk/conf/directory/default/1013.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1013.xml (original) +++ freeswitch/trunk/conf/directory/default/1013.xml Sun Dec 16 14:11:13 2007 @@ -4,6 +4,8 @@ <param name="password" value="1234"/> </params> <variables> + <variable name="accountcode" value="1013"/> + <variable name="presence_id" value="1013@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1013"/> <variable name="effective_caller_id_number" value="1013"/> Modified: freeswitch/trunk/conf/directory/default/1014.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1014.xml (original) +++ freeswitch/trunk/conf/directory/default/1014.xml Sun Dec 16 14:11:13 2007 @@ -4,6 +4,8 @@ <param name="password" value="1234"/> </params> <variables> + <variable name="accountcode" value="1014"/> + <variable name="presence_id" value="1014@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1014"/> <variable name="effective_caller_id_number" value="1014"/> Modified: freeswitch/trunk/conf/directory/default/1015.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1015.xml (original) +++ freeswitch/trunk/conf/directory/default/1015.xml Sun Dec 16 14:11:13 2007 @@ -4,6 +4,8 @@ <param name="password" value="1234"/> </params> <variables> + <variable name="accountcode" value="1015"/> + <variable name="presence_id" value="1015@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1015"/> <variable name="effective_caller_id_number" value="1015"/> Modified: freeswitch/trunk/conf/directory/default/1016.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1016.xml (original) +++ freeswitch/trunk/conf/directory/default/1016.xml Sun Dec 16 14:11:13 2007 @@ -4,6 +4,8 @@ <param name="password" value="1234"/> </params> <variables> + <variable name="accountcode" value="1016"/> + <variable name="presence_id" value="1016@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1016"/> <variable name="effective_caller_id_number" value="1016"/> Modified: freeswitch/trunk/conf/directory/default/1017.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1017.xml (original) +++ freeswitch/trunk/conf/directory/default/1017.xml Sun Dec 16 14:11:13 2007 @@ -4,6 +4,8 @@ <param name="password" value="1234"/> </params> <variables> + <variable name="accountcode" value="1017"/> + <variable name="presence_id" value="1017@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1017"/> <variable name="effective_caller_id_number" value="1017"/> Modified: freeswitch/trunk/conf/directory/default/1018.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1018.xml (original) +++ freeswitch/trunk/conf/directory/default/1018.xml Sun Dec 16 14:11:13 2007 @@ -4,6 +4,8 @@ <param name="password" value="1234"/> </params> <variables> + <variable name="accountcode" value="1018"/> + <variable name="presence_id" value="1018@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1018"/> <variable name="effective_caller_id_number" value="1018"/> Modified: freeswitch/trunk/conf/directory/default/1019.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1019.xml (original) +++ freeswitch/trunk/conf/directory/default/1019.xml Sun Dec 16 14:11:13 2007 @@ -4,6 +4,8 @@ <param name="password" value="1234"/> </params> <variables> + <variable name="accountcode" value="1019"/> + <variable name="presence_id" value="1019@$${domain}"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1019"/> <variable name="effective_caller_id_number" value="1019"/>

1 0

[commit] r6827 - in freeswitch/trunk/src/mod/event_handlers: mod_event_multicast mod_event_socket
by Freeswitch SVN 16 Dec '07

16 Dec '07

Author: mikej Date: Sat Dec 15 22:01:50 2007 New Revision: 6827 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: cleanup, reduce large stack allocation, bounds checking, etc. Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Sat Dec 15 22:01:50 2007 @@ -30,6 +30,9 @@ * */ #include <switch.h> + +#define MULTICAST_BUFFSIZE 65536 + static char *MARKER = "1"; SWITCH_MODULE_LOAD_FUNCTION(mod_event_multicast_load); @@ -116,7 +119,9 @@ globals.event_list[x] = 0; } } - globals.event_list[type] = 1; + if (type <= SWITCH_EVENT_ALL) { + globals.event_list[type] = 1; + } if (type == SWITCH_EVENT_CUSTOM) { custom++; } @@ -136,10 +141,12 @@ static void event_handler(switch_event_t *event) { - char buf[65536]; + char *buf; size_t len; uint8_t send = 0; + buf = (char *) malloc(MULTICAST_BUFFSIZE); + switch_assert(buf); if (event->subclass && !strcmp(event->subclass->name, MULTICAST_EVENT)) { /* ignore our own events to avoid ping pong */ @@ -251,9 +258,11 @@ SWITCH_MODULE_RUNTIME_FUNCTION(mod_event_multicast_runtime) { switch_event_t *local_event; - char buf[65536] = { 0 }; + char *buf; switch_sockaddr_t *addr; + buf = (char *) malloc(MULTICAST_BUFFSIZE); + switch_assert(buf); switch_sockaddr_info_get(&addr, NULL, SWITCH_UNSPEC, 0, 0, module_pool); globals.running = 1; while (globals.running == 1) { Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Sat Dec 15 22:01:50 2007 @@ -122,7 +122,7 @@ switch_event_t *clone = NULL; listener_t *l; - assert(event != NULL); + switch_assert(event != NULL); if (!listen_list.ready) { return; @@ -465,18 +465,18 @@ if (switch_test_flag(listener, LFLAG_EVENTS)) { if (switch_queue_trypop(listener->event_queue, &pop) == SWITCH_STATUS_SUCCESS) { char hbuf[512]; - switch_event_t *event = (switch_event_t *) pop; + switch_event_t *pevent = (switch_event_t *) pop; char *etype; do_sleep = 0; if (listener->format == EVENT_FORMAT_PLAIN) { etype = "plain"; - switch_event_serialize(event, &listener->ebuf, SWITCH_TRUE); + switch_event_serialize(pevent, &listener->ebuf, SWITCH_TRUE); } else { switch_xml_t xml; etype = "xml"; - if ((xml = switch_event_xmlize(event, "%s", ""))) { + if ((xml = switch_event_xmlize(pevent, "%s", ""))) { listener->ebuf = switch_xml_toxml(xml, SWITCH_FALSE); switch_xml_free(xml); } else { @@ -618,7 +618,7 @@ if (listener->session) { switch_channel_t *channel = switch_core_session_get_channel(listener->session); - assert(channel != NULL); + switch_assert(channel != NULL); if (!strncasecmp(cmd, "connect", 7)) { switch_snprintf(reply, reply_len, "+OK"); @@ -785,7 +785,7 @@ switch_core_new_memory_pool(&pool); acs = switch_core_alloc(pool, sizeof(*acs)); - assert(acs); + switch_assert(acs); acs->pool = pool; acs->listener = listener; if (api_cmd) { @@ -882,7 +882,9 @@ listener->event_list[x] = 1; } } - listener->event_list[type] = 1; + if (type <= SWITCH_EVENT_ALL) { + listener->event_list[type] = 1; + } if (type == SWITCH_EVENT_CUSTOM) { custom++; } @@ -1004,7 +1006,7 @@ prefs.threads++; switch_mutex_unlock(listen_list.mutex); - assert(listener != NULL); + switch_assert(listener != NULL); if ((session = listener->session)) { channel = switch_core_session_get_channel(session); @@ -1018,14 +1020,14 @@ add_listener(listener); if (session && switch_test_flag(listener, LFLAG_AUTHED)) { - switch_event_t *event = NULL, *call_event; + switch_event_t *ievent = NULL, *call_event; char *event_str; switch_set_flag_locked(listener, LFLAG_SESSION); - status = read_packet(listener, &event, 25); + status = read_packet(listener, &ievent, 25); - if (status != SWITCH_STATUS_SUCCESS || !event) { + if (status != SWITCH_STATUS_SUCCESS || !ievent) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Socket Error!\n"); switch_clear_flag_locked(listener, LFLAG_RUNNING); goto done; @@ -1037,7 +1039,7 @@ goto done; } - if (parse_command(listener, event, reply, sizeof(reply)) != SWITCH_STATUS_SUCCESS) { + if (parse_command(listener, ievent, reply, sizeof(reply)) != SWITCH_STATUS_SUCCESS) { switch_clear_flag_locked(listener, LFLAG_RUNNING); goto done; } @@ -1088,21 +1090,21 @@ } while (switch_test_flag(listener, LFLAG_RUNNING) && listen_list.ready) { - switch_event_t *event; + switch_event_t *revent; len = sizeof(buf); memset(buf, 0, len); - status = read_packet(listener, &event, 0); + status = read_packet(listener, &revent, 0); if (status != SWITCH_STATUS_SUCCESS) { break; } - if (!event) { + if (!revent) { continue; } - if (parse_command(listener, event, reply, sizeof(reply)) != SWITCH_STATUS_SUCCESS) { + if (parse_command(listener, revent, reply, sizeof(reply)) != SWITCH_STATUS_SUCCESS) { switch_clear_flag_locked(listener, LFLAG_RUNNING); break; }

1 0

[commit] r6826 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 16 Dec '07

16 Dec '07

Author: brian Date: Sat Dec 15 21:53:34 2007 New Revision: 6826 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: tweak Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Sat Dec 15 21:53:34 2007 @@ -50,7 +50,7 @@ </condition> </extension> - <extension name="star-69"> + <extension name="call_return"> <condition field="destination_number" expression="^\*69$|^869$"> <action application="transfer" data="${db(select/call_return/${caller_id_number})}"/> </condition> @@ -124,7 +124,7 @@ </extension>  - <extension name="SIP_URI"> + <extension name="sip_uri"> <condition field="destination_number" expression="^sip:(.*)$"> <action application="bridge" data="sofia/${use_profile}/$1"/> </condition> @@ -134,7 +134,7 @@ start a dynamic conference with the settings of the "default" conference profile in conference.conf.xml --> - <extension name="Conferences"> + <extension name="conferences"> <condition field="destination_number" expression="^(3\d{3})$"> <action application="conference" data="$1@default"/> </condition> @@ -161,7 +161,7 @@ </extension>  - <extension name="IVR_Demo"> + <extension name="ivr_demo"> <condition field="destination_number" expression="5000"> <action application="ivr" data="demo"/> </condition>

1 0

[commit] r6825 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 16 Dec '07

16 Dec '07

Author: brian Date: Sat Dec 15 21:44:54 2007 New Revision: 6825 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: tweak Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Sat Dec 15 21:44:54 2007 @@ -35,6 +35,7 @@ <action application="set_user" data="default@${domain}"/> </condition> <condition> + <action application="info"/> <action application="db" data="insert/spymap/${caller_id_number}/${uuid}"/> <action application="db" data="insert/last_dial/${caller_id_number}/${destination_number}"/> <action application="db" data="insert/last_dial/global/${uuid}"/> @@ -141,8 +142,8 @@  <extension name="freeswitch_public_conf_via_sip"> - <condition field="destination_number" expression="^888$"> - <action application="bridge" data="sofia/${use_profile}/888(a)conference.freeswitch.org"/> + <condition field="destination_number" expression="^9(888|1616)$"> + <action application="bridge" data="sofia/${use_profile}/$1(a)conference.freeswitch.org"/> </condition> </extension>

1 0

[commit] r6824 - freeswitch/trunk/src/mod/applications/mod_expr
by Freeswitch SVN 16 Dec '07

16 Dec '07

Author: mikej Date: Sat Dec 15 20:56:20 2007 New Revision: 6824 Modified: freeswitch/trunk/src/mod/applications/mod_expr/exprilfs.h freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.2008.vcproj Log: build cleanup. Modified: freeswitch/trunk/src/mod/applications/mod_expr/exprilfs.h ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_expr/exprilfs.h (original) +++ freeswitch/trunk/src/mod/applications/mod_expr/exprilfs.h Sat Dec 15 20:56:20 2007 @@ -138,15 +138,15 @@ /* max */ case EXPR_NODEFUNC_MAX: { - int pos; + int tmppos; err = exprEvalNode(obj, nodes->data.function.nodes, 0, &d1); if(!err) { - for(pos = 1; pos < nodes->data.function.nodecount; pos++) + for(tmppos = 1; tmppos < nodes->data.function.nodecount; tmppos++) { - err = exprEvalNode(obj, nodes->data.function.nodes, pos, &d2); + err = exprEvalNode(obj, nodes->data.function.nodes, tmppos, &d2); if(!err) { if(d2 > d1) @@ -1015,7 +1015,7 @@ /* for */ case EXPR_NODEFUNC_FOR: { - int pos; + int tmppos; EXPRTYPE test; err = exprEvalNode(obj, nodes->data.function.nodes, 0, &d1); @@ -1027,9 +1027,9 @@ { while(test != 0.0) { - for(pos = 3; pos < nodes->data.function.nodecount; pos++) + for(tmppos = 3; tmppos < nodes->data.function.nodecount; tmppos++) { - err = exprEvalNode(obj, nodes->data.function.nodes, pos, val); + err = exprEvalNode(obj, nodes->data.function.nodes, tmppos, val); if(err) return err; } Modified: freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.2008.vcproj Sat Dec 15 20:56:20 2007 @@ -39,6 +39,7 @@ /> <Tool Name="VCCLCompilerTool" + DefaultCharIsUnsigned="true" UsePrecompiledHeader="0" DisableSpecificWarnings="4100;4701" /> @@ -101,6 +102,7 @@ /> <Tool Name="VCCLCompilerTool" + DefaultCharIsUnsigned="true" UsePrecompiledHeader="0" DisableSpecificWarnings="4100;4701" />

1 0