提交 1df3896b authored 作者: Anthony Minessale's avatar Anthony Minessale

nut n' honey

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9073 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 3b2fab8c
...@@ -728,6 +728,12 @@ SWITCH_DECLARE(switch_status_t) switch_file_open(switch_file_t **newf, const cha ...@@ -728,6 +728,12 @@ SWITCH_DECLARE(switch_status_t) switch_file_open(switch_file_t **newf, const cha
SWITCH_DECLARE(switch_status_t) switch_file_seek(switch_file_t *thefile, switch_seek_where_t where, int64_t *offset); SWITCH_DECLARE(switch_status_t) switch_file_seek(switch_file_t *thefile, switch_seek_where_t where, int64_t *offset);
SWITCH_DECLARE(switch_status_t) switch_file_copy(const char *from_path,
const char *to_path,
switch_fileperms_t perms,
switch_memory_pool_t *pool);
/** /**
* Close the specified file. * Close the specified file.
* @param thefile The file descriptor to close. * @param thefile The file descriptor to close.
......
...@@ -223,6 +223,7 @@ SWITCH_DECLARE(const char *) switch_channel_get_variable_partner(switch_channel_ ...@@ -223,6 +223,7 @@ SWITCH_DECLARE(const char *) switch_channel_get_variable_partner(switch_channel_
\return the value of the requested variable \return the value of the requested variable
*/ */
SWITCH_DECLARE(const char *) switch_channel_get_variable(switch_channel_t *channel, const char *varname); SWITCH_DECLARE(const char *) switch_channel_get_variable(switch_channel_t *channel, const char *varname);
SWITCH_DECLARE(switch_status_t) switch_channel_get_variables(switch_channel_t *channel, switch_event_t **event);
/*! /*!
* Start iterating over the entries in the channel variable list. * Start iterating over the entries in the channel variable list.
......
...@@ -294,6 +294,15 @@ SWITCH_DECLARE(switch_status_t) switch_file_seek(switch_file_t *thefile, switch_ ...@@ -294,6 +294,15 @@ SWITCH_DECLARE(switch_status_t) switch_file_seek(switch_file_t *thefile, switch_
return rv; return rv;
} }
SWITCH_DECLARE(switch_status_t) switch_file_copy(const char *from_path,
const char *to_path,
switch_fileperms_t perms,
switch_memory_pool_t *pool)
{
return apr_file_copy(from_path, to_path, perms, pool);
}
SWITCH_DECLARE(switch_status_t) switch_file_close(switch_file_t *thefile) SWITCH_DECLARE(switch_status_t) switch_file_close(switch_file_t *thefile)
{ {
return apr_file_close(thefile); return apr_file_close(thefile);
......
...@@ -1951,6 +1951,15 @@ SWITCH_DECLARE(char *) switch_channel_build_param_string(switch_channel_t *chann ...@@ -1951,6 +1951,15 @@ SWITCH_DECLARE(char *) switch_channel_build_param_string(switch_channel_t *chann
return stream.data; return stream.data;
} }
SWITCH_DECLARE(switch_status_t) switch_channel_get_variables(switch_channel_t *channel, switch_event_t **event)
{
switch_status_t status;
switch_mutex_lock(channel->profile_mutex);
status = switch_event_dup(event, channel->variables);
switch_mutex_lock(channel->profile_mutex);
return status;
}
SWITCH_DECLARE(switch_status_t) switch_channel_set_timestamps(switch_channel_t *channel) SWITCH_DECLARE(switch_status_t) switch_channel_set_timestamps(switch_channel_t *channel)
{ {
switch_status_t status = SWITCH_STATUS_SUCCESS; switch_status_t status = SWITCH_STATUS_SUCCESS;
......
...@@ -786,9 +786,12 @@ SWITCH_DECLARE(void) switch_load_network_lists(switch_bool_t reload) ...@@ -786,9 +786,12 @@ SWITCH_DECLARE(void) switch_load_network_lists(switch_bool_t reload)
if (switch_xml_locate_domain(domain, my_params, &xml_root, &x_domain) != SWITCH_STATUS_SUCCESS) { if (switch_xml_locate_domain(domain, my_params, &xml_root, &x_domain) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot locate domain %s\n", domain); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot locate domain %s\n", domain);
switch_event_destroy(&my_params);
continue; continue;
} }
switch_event_destroy(&my_params);
for (ut = switch_xml_child(x_domain, "user"); ut; ut = ut->next) { for (ut = switch_xml_child(x_domain, "user"); ut; ut = ut->next) {
const char *user_cidr = switch_xml_attr(ut, "cidr"); const char *user_cidr = switch_xml_attr(ut, "cidr");
const char *id = switch_xml_attr(ut, "id"); const char *id = switch_xml_attr(ut, "id");
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论