Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
9283d90f
提交
9283d90f
authored
5月 20, 2013
作者:
Chris Rienzo
提交者:
Travis Cross
6月 07, 2013
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
mod_http_cache: added write file format
上级
7fcdf4a0
隐藏空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
127 行增加
和
51 行删除
+127
-51
mod_http_cache.c
src/mod/applications/mod_http_cache/mod_http_cache.c
+127
-51
没有找到文件。
src/mod/applications/mod_http_cache/mod_http_cache.c
浏览文件 @
9283d90f
...
@@ -97,7 +97,7 @@ struct cached_url {
...
@@ -97,7 +97,7 @@ struct cached_url {
};
};
typedef
struct
cached_url
cached_url_t
;
typedef
struct
cached_url
cached_url_t
;
static
cached_url_t
*
cached_url_create
(
url_cache_t
*
cache
,
const
char
*
url
);
static
cached_url_t
*
cached_url_create
(
url_cache_t
*
cache
,
const
char
*
url
,
const
char
*
filename
);
static
void
cached_url_destroy
(
cached_url_t
*
url
,
switch_memory_pool_t
*
pool
);
static
void
cached_url_destroy
(
cached_url_t
*
url
,
switch_memory_pool_t
*
pool
);
/**
/**
...
@@ -116,7 +116,7 @@ static size_t get_file_callback(void *ptr, size_t size, size_t nmemb, void *get)
...
@@ -116,7 +116,7 @@ static size_t get_file_callback(void *ptr, size_t size, size_t nmemb, void *get)
static
size_t
get_header_callback
(
void
*
ptr
,
size_t
size
,
size_t
nmemb
,
void
*
url
);
static
size_t
get_header_callback
(
void
*
ptr
,
size_t
size
,
size_t
nmemb
,
void
*
url
);
static
void
process_cache_control_header
(
cached_url_t
*
url
,
char
*
data
);
static
void
process_cache_control_header
(
cached_url_t
*
url
,
char
*
data
);
static
switch_status_t
http_put
(
url_cache_t
*
cache
,
http_profile_t
*
profile
,
switch_core_session_t
*
session
,
const
char
*
url
,
const
char
*
filename
);
static
switch_status_t
http_put
(
url_cache_t
*
cache
,
http_profile_t
*
profile
,
switch_core_session_t
*
session
,
const
char
*
url
,
const
char
*
filename
,
int
cache_local_file
);
/**
/**
* Queue used for clock cache replacement algorithm. This
* Queue used for clock cache replacement algorithm. This
...
@@ -206,9 +206,10 @@ static switch_curl_slist_t *append_aws_s3_headers(switch_curl_slist_t *headers,
...
@@ -206,9 +206,10 @@ static switch_curl_slist_t *append_aws_s3_headers(switch_curl_slist_t *headers,
* @param session the (optional) session uploading the file
* @param session the (optional) session uploading the file
* @param url The URL
* @param url The URL
* @param filename The file to upload
* @param filename The file to upload
* @param cache_local_file true if local file should be mapped to url in cache
* @return SWITCH_STATUS_SUCCESS if successful
* @return SWITCH_STATUS_SUCCESS if successful
*/
*/
static
switch_status_t
http_put
(
url_cache_t
*
cache
,
http_profile_t
*
profile
,
switch_core_session_t
*
session
,
const
char
*
url
,
const
char
*
filename
)
static
switch_status_t
http_put
(
url_cache_t
*
cache
,
http_profile_t
*
profile
,
switch_core_session_t
*
session
,
const
char
*
url
,
const
char
*
filename
,
int
cache_local_file
)
{
{
switch_status_t
status
=
SWITCH_STATUS_SUCCESS
;
switch_status_t
status
=
SWITCH_STATUS_SUCCESS
;
...
@@ -290,6 +291,20 @@ static switch_status_t http_put(url_cache_t *cache, http_profile_t *profile, swi
...
@@ -290,6 +291,20 @@ static switch_status_t http_put(url_cache_t *cache, http_profile_t *profile, swi
if
(
httpRes
==
200
||
httpRes
==
201
||
httpRes
==
204
)
{
if
(
httpRes
==
200
||
httpRes
==
201
||
httpRes
==
204
)
{
switch_log_printf
(
SWITCH_CHANNEL_SESSION_LOG
(
session
),
SWITCH_LOG_DEBUG
,
"%s saved to %s
\n
"
,
filename
,
url
);
switch_log_printf
(
SWITCH_CHANNEL_SESSION_LOG
(
session
),
SWITCH_LOG_DEBUG
,
"%s saved to %s
\n
"
,
filename
,
url
);
if
(
cache_local_file
)
{
cached_url_t
*
u
=
NULL
;
/* save to cache */
url_cache_lock
(
cache
,
session
);
u
=
cached_url_create
(
cache
,
url
,
filename
);
u
->
size
=
file_info
.
st_size
;
u
->
status
=
CACHED_URL_AVAILABLE
;
if
(
url_cache_add
(
cache
,
session
,
u
)
!=
SWITCH_STATUS_SUCCESS
)
{
/* This error should never happen */
switch_log_printf
(
SWITCH_CHANNEL_SESSION_LOG
(
session
),
SWITCH_LOG_CRIT
,
"Failed to add URL to cache!
\n
"
);
cached_url_destroy
(
u
,
cache
->
pool
);
}
url_cache_unlock
(
cache
,
session
);
}
}
else
{
}
else
{
switch_log_printf
(
SWITCH_CHANNEL_SESSION_LOG
(
session
),
SWITCH_LOG_ERROR
,
"Received HTTP error %ld trying to save %s to %s
\n
"
,
httpRes
,
filename
,
url
);
switch_log_printf
(
SWITCH_CHANNEL_SESSION_LOG
(
session
),
SWITCH_LOG_ERROR
,
"Received HTTP error %ld trying to save %s to %s
\n
"
,
httpRes
,
filename
,
url
);
status
=
SWITCH_STATUS_GENERR
;
status
=
SWITCH_STATUS_GENERR
;
...
@@ -547,7 +562,7 @@ static char *url_cache_get(url_cache_t *cache, http_profile_t *profile, switch_c
...
@@ -547,7 +562,7 @@ static char *url_cache_get(url_cache_t *cache, http_profile_t *profile, switch_c
/* Set up URL entry and add to map to prevent simultaneous downloads */
/* Set up URL entry and add to map to prevent simultaneous downloads */
cache
->
misses
++
;
cache
->
misses
++
;
switch_log_printf
(
SWITCH_CHANNEL_SESSION_LOG
(
session
),
SWITCH_LOG_INFO
,
"Cache MISS: size = %zu (%zu MB), hit ratio = %d/%d
\n
"
,
cache
->
queue
.
size
,
cache
->
size
/
1000000
,
cache
->
hits
,
cache
->
hits
+
cache
->
misses
);
switch_log_printf
(
SWITCH_CHANNEL_SESSION_LOG
(
session
),
SWITCH_LOG_INFO
,
"Cache MISS: size = %zu (%zu MB), hit ratio = %d/%d
\n
"
,
cache
->
queue
.
size
,
cache
->
size
/
1000000
,
cache
->
hits
,
cache
->
hits
+
cache
->
misses
);
u
=
cached_url_create
(
cache
,
url
);
u
=
cached_url_create
(
cache
,
url
,
NULL
);
if
(
url_cache_add
(
cache
,
session
,
u
)
!=
SWITCH_STATUS_SUCCESS
)
{
if
(
url_cache_add
(
cache
,
session
,
u
)
!=
SWITCH_STATUS_SUCCESS
)
{
/* This error should never happen */
/* This error should never happen */
url_cache_unlock
(
cache
,
session
);
url_cache_unlock
(
cache
,
session
);
...
@@ -734,52 +749,81 @@ static void url_cache_http_profile_add(url_cache_t *cache, const char *name, con
...
@@ -734,52 +749,81 @@ static void url_cache_http_profile_add(url_cache_t *cache, const char *name, con
}
}
/**
/**
* Create a cached URL entry
* Find file extension at end of URL.
* @param cache the cache
* @return file extension or NULL if it doesn't exist
* @param url the URL to cache
* @return the cached URL
*/
*/
static
c
ached_url_t
*
cached_url_create
(
url_cache_t
*
cache
,
const
char
*
url
)
static
c
onst
char
*
find_extension
(
const
char
*
url
)
{
{
switch_uuid_t
uuid
;
const
char
*
ext
;
char
uuid_str
[
SWITCH_UUID_FORMATTED_LENGTH
+
1
]
=
{
0
};
char
*
filename
=
NULL
;
char
uuid_dir
[
3
]
=
{
0
};
char
*
dirname
=
NULL
;
cached_url_t
*
u
=
NULL
;
const
char
*
file_extension
=
""
;
const
char
*
ext
=
NULL
;
if
(
zstr
(
url
))
{
/* find extension on the end of URL */
return
NULL
;
for
(
ext
=
&
url
[
strlen
(
url
)
-
1
];
ext
!=
url
;
ext
--
)
{
if
(
*
ext
==
'/'
||
*
ext
==
'\\'
)
{
break
;
}
if
(
*
ext
==
'.'
)
{
/* found it */
return
++
ext
;
}
}
}
return
NULL
;
}
switch_zmalloc
(
u
,
sizeof
(
cached_url_t
));
/**
* Create a cached URL filename.
* @param cache the cache
* @param extension the filename extension
* @return the cached URL filename. Free when done.
*/
static
char
*
cached_url_filename_create
(
url_cache_t
*
cache
,
const
char
*
extension
)
{
char
*
filename
;
char
*
dirname
;
char
uuid_dir
[
3
]
=
{
0
};
switch_uuid_t
uuid
;
char
uuid_str
[
SWITCH_UUID_FORMATTED_LENGTH
+
1
]
=
{
0
};
/* filename is constructed from UUID and is stored in cache dir (first 2 characters of UUID) */
/* filename is constructed from UUID and is stored in cache dir (first 2 characters of UUID) */
switch_uuid_get
(
&
uuid
);
switch_uuid_get
(
&
uuid
);
switch_uuid_format
(
uuid_str
,
&
uuid
);
switch_uuid_format
(
uuid_str
,
&
uuid
);
strncpy
(
uuid_dir
,
uuid_str
,
2
);
strncpy
(
uuid_dir
,
uuid_str
,
2
);
dirname
=
switch_mprintf
(
"%s%s%s"
,
cache
->
location
,
SWITCH_PATH_SEPARATOR
,
uuid_dir
);
dirname
=
switch_mprintf
(
"%s%s%s"
,
cache
->
location
,
SWITCH_PATH_SEPARATOR
,
uuid_dir
);
filename
=
&
uuid_str
[
2
];
/* create sub-directory if it doesn't exist */
/* create sub-directory if it doesn't exist */
switch_dir_make_recursive
(
dirname
,
SWITCH_DEFAULT_DIR_PERMS
,
cache
->
pool
);
switch_dir_make_recursive
(
dirname
,
SWITCH_DEFAULT_DIR_PERMS
,
cache
->
pool
);
/* find extension on the end of URL */
if
(
!
zstr
(
extension
))
{
for
(
ext
=
&
url
[
strlen
(
url
)
-
1
];
ext
!=
url
;
ext
--
)
{
filename
=
switch_mprintf
(
"%s%s%s.%s"
,
dirname
,
SWITCH_PATH_SEPARATOR
,
&
uuid_str
[
2
],
extension
);
if
(
*
ext
==
'/'
||
*
ext
==
'\\'
)
{
}
else
{
break
;
filename
=
switch_mprintf
(
"%s%s%s"
,
dirname
,
SWITCH_PATH_SEPARATOR
,
&
uuid_str
[
2
]);
}
if
(
*
ext
==
'.'
)
{
/* found it */
file_extension
=
ext
;
break
;
}
}
}
free
(
dirname
);
return
filename
;
}
/**
* Create a cached URL entry
* @param cache the cache
* @param url the URL to cache
* @param filename (optional) pre-defined local filename
* @return the cached URL
*/
static
cached_url_t
*
cached_url_create
(
url_cache_t
*
cache
,
const
char
*
url
,
const
char
*
filename
)
{
cached_url_t
*
u
=
NULL
;
if
(
zstr
(
url
))
{
return
NULL
;
}
switch_zmalloc
(
u
,
sizeof
(
cached_url_t
));
/* intialize cached URL */
/* intialize cached URL */
u
->
filename
=
switch_mprintf
(
"%s%s%s%s"
,
dirname
,
SWITCH_PATH_SEPARATOR
,
filename
,
file_extension
);
if
(
zstr
(
filename
))
{
u
->
filename
=
cached_url_filename_create
(
cache
,
find_extension
(
url
));
}
else
{
u
->
filename
=
strdup
(
filename
);
}
u
->
url
=
switch_safe_strdup
(
url
);
u
->
url
=
switch_safe_strdup
(
url
);
u
->
size
=
0
;
u
->
size
=
0
;
u
->
used
=
1
;
u
->
used
=
1
;
...
@@ -788,8 +832,6 @@ static cached_url_t *cached_url_create(url_cache_t *cache, const char *url)
...
@@ -788,8 +832,6 @@ static cached_url_t *cached_url_create(url_cache_t *cache, const char *url)
u
->
download_time
=
switch_time_now
();
u
->
download_time
=
switch_time_now
();
u
->
max_age
=
cache
->
default_max_age
;
u
->
max_age
=
cache
->
default_max_age
;
switch_safe_free
(
dirname
);
return
u
;
return
u
;
}
}
...
@@ -1136,7 +1178,7 @@ SWITCH_STANDARD_API(http_cache_put)
...
@@ -1136,7 +1178,7 @@ SWITCH_STANDARD_API(http_cache_put)
profile
=
url_cache_http_profile_find
(
&
gcache
,
switch_event_get_header
(
params
,
"profile"
));
profile
=
url_cache_http_profile_find
(
&
gcache
,
switch_event_get_header
(
params
,
"profile"
));
}
}
status
=
http_put
(
&
gcache
,
profile
,
session
,
url
,
argv
[
1
]);
status
=
http_put
(
&
gcache
,
profile
,
session
,
url
,
argv
[
1
]
,
0
);
if
(
status
==
SWITCH_STATUS_SUCCESS
)
{
if
(
status
==
SWITCH_STATUS_SUCCESS
)
{
stream
->
write_function
(
stream
,
"+OK
\n
"
);
stream
->
write_function
(
stream
,
"+OK
\n
"
);
}
else
{
}
else
{
...
@@ -1353,6 +1395,9 @@ done:
...
@@ -1353,6 +1395,9 @@ done:
*/
*/
struct
http_context
{
struct
http_context
{
switch_file_handle_t
fh
;
switch_file_handle_t
fh
;
http_profile_t
*
profile
;
char
*
local_path
;
const
char
*
write_url
;
};
};
/**
/**
...
@@ -1364,30 +1409,38 @@ struct http_context {
...
@@ -1364,30 +1409,38 @@ struct http_context {
static
switch_status_t
http_cache_file_open
(
switch_file_handle_t
*
handle
,
const
char
*
path
)
static
switch_status_t
http_cache_file_open
(
switch_file_handle_t
*
handle
,
const
char
*
path
)
{
{
switch_status_t
status
=
SWITCH_STATUS_SUCCESS
;
switch_status_t
status
=
SWITCH_STATUS_SUCCESS
;
http_profile_t
*
profile
=
NULL
;
struct
http_context
*
context
=
switch_core_alloc
(
handle
->
memory_pool
,
sizeof
(
*
context
));
struct
http_context
*
context
=
switch_core_alloc
(
handle
->
memory_pool
,
sizeof
(
*
context
));
const
char
*
local_path
;
int
file_flags
=
SWITCH_FILE_DATA_SHORT
;
if
(
switch_test_flag
(
handle
,
SWITCH_FILE_FLAG_WRITE
))
{
/* WRITE not supported */
return
SWITCH_STATUS_FALSE
;
}
if
(
handle
->
params
)
{
if
(
handle
->
params
)
{
profile
=
url_cache_http_profile_find
(
&
gcache
,
switch_event_get_header
(
handle
->
params
,
"profile"
));
context
->
profile
=
url_cache_http_profile_find
(
&
gcache
,
switch_event_get_header
(
handle
->
params
,
"profile"
));
}
}
local_path
=
url_cache_get
(
&
gcache
,
profile
,
NULL
,
path
,
1
,
handle
->
memory_pool
);
if
(
!
local_path
)
{
if
(
switch_test_flag
(
handle
,
SWITCH_FILE_FLAG_WRITE
))
{
return
SWITCH_STATUS_FALSE
;
/* WRITE = HTTP PUT */
file_flags
|=
SWITCH_FILE_FLAG_WRITE
;
context
->
write_url
=
switch_core_strdup
(
handle
->
memory_pool
,
path
);
/* allocate local file in cache */
context
->
local_path
=
cached_url_filename_create
(
&
gcache
,
find_extension
(
context
->
write_url
));
}
else
{
/* READ = HTTP GET */
file_flags
|=
SWITCH_FILE_FLAG_READ
;
context
->
local_path
=
url_cache_get
(
&
gcache
,
context
->
profile
,
NULL
,
path
,
1
,
handle
->
memory_pool
);
if
(
!
context
->
local_path
)
{
return
SWITCH_STATUS_FALSE
;
}
}
}
if
((
status
=
switch_core_file_open
(
&
context
->
fh
,
if
((
status
=
switch_core_file_open
(
&
context
->
fh
,
local_path
,
context
->
local_path
,
handle
->
channels
,
handle
->
channels
,
handle
->
samplerate
,
handle
->
samplerate
,
SWITCH_FILE_FLAG_READ
|
SWITCH_FILE_DATA_SHORT
,
NULL
))
!=
SWITCH_STATUS_SUCCESS
)
{
file_flags
,
NULL
))
!=
SWITCH_STATUS_SUCCESS
)
{
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_ERROR
,
"Failed to open HTTP cache file: %s, %s
\n
"
,
local_path
,
path
);
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_ERROR
,
"Failed to open HTTP cache file: %s, %s
\n
"
,
context
->
local_path
,
path
);
return
status
;
if
(
switch_test_flag
(
handle
,
SWITCH_FILE_FLAG_WRITE
))
{
switch_safe_free
(
context
->
local_path
);
}
return
status
;
}
}
handle
->
private_info
=
context
;
handle
->
private_info
=
context
;
...
@@ -1444,6 +1497,19 @@ static switch_status_t http_file_read(switch_file_handle_t *handle, void *data,
...
@@ -1444,6 +1497,19 @@ static switch_status_t http_file_read(switch_file_handle_t *handle, void *data,
return
switch_core_file_read
(
&
context
->
fh
,
data
,
len
);
return
switch_core_file_read
(
&
context
->
fh
,
data
,
len
);
}
}
/**
* Write to HTTP file
* @param handle
* @param data
* @param len
* @return
*/
static
switch_status_t
http_file_write
(
switch_file_handle_t
*
handle
,
void
*
data
,
size_t
*
len
)
{
struct
http_context
*
context
=
(
struct
http_context
*
)
handle
->
private_info
;
return
switch_core_file_write
(
&
context
->
fh
,
data
,
len
);
}
/**
/**
* Close HTTP file
* Close HTTP file
* @param handle
* @param handle
...
@@ -1452,7 +1518,15 @@ static switch_status_t http_file_read(switch_file_handle_t *handle, void *data,
...
@@ -1452,7 +1518,15 @@ static switch_status_t http_file_read(switch_file_handle_t *handle, void *data,
static
switch_status_t
http_file_close
(
switch_file_handle_t
*
handle
)
static
switch_status_t
http_file_close
(
switch_file_handle_t
*
handle
)
{
{
struct
http_context
*
context
=
(
struct
http_context
*
)
handle
->
private_info
;
struct
http_context
*
context
=
(
struct
http_context
*
)
handle
->
private_info
;
return
switch_core_file_close
(
&
context
->
fh
);
switch_status_t
status
=
switch_core_file_close
(
&
context
->
fh
);
if
(
status
==
SWITCH_STATUS_SUCCESS
&&
!
zstr
(
context
->
write_url
))
{
status
=
http_put
(
&
gcache
,
context
->
profile
,
NULL
,
context
->
write_url
,
context
->
local_path
,
1
);
}
if
(
!
zstr
(
context
->
write_url
))
{
switch_safe_free
(
context
->
local_path
);
}
return
status
;
}
}
static
char
*
http_supported_formats
[]
=
{
"http"
,
NULL
};
static
char
*
http_supported_formats
[]
=
{
"http"
,
NULL
};
...
@@ -1501,6 +1575,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_http_cache_load)
...
@@ -1501,6 +1575,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_http_cache_load)
file_interface
->
file_open
=
http_file_open
;
file_interface
->
file_open
=
http_file_open
;
file_interface
->
file_close
=
http_file_close
;
file_interface
->
file_close
=
http_file_close
;
file_interface
->
file_read
=
http_file_read
;
file_interface
->
file_read
=
http_file_read
;
file_interface
->
file_write
=
http_file_write
;
file_interface
=
switch_loadable_module_create_interface
(
*
module_interface
,
SWITCH_FILE_INTERFACE
);
file_interface
=
switch_loadable_module_create_interface
(
*
module_interface
,
SWITCH_FILE_INTERFACE
);
file_interface
->
interface_name
=
modname
;
file_interface
->
interface_name
=
modname
;
...
@@ -1508,6 +1583,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_http_cache_load)
...
@@ -1508,6 +1583,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_http_cache_load)
file_interface
->
file_open
=
https_file_open
;
file_interface
->
file_open
=
https_file_open
;
file_interface
->
file_close
=
http_file_close
;
file_interface
->
file_close
=
http_file_close
;
file_interface
->
file_read
=
http_file_read
;
file_interface
->
file_read
=
http_file_read
;
file_interface
->
file_write
=
http_file_write
;
}
}
/* create the queue from configuration */
/* create the queue from configuration */
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论