Skip to content

Commit

Permalink
httpapitest Small cosmetic fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
oej committed Jun 7, 2016
1 parent 756d152 commit ee14cf1
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
11 changes: 8 additions & 3 deletions test/mod_httpapitest/httpapitest.c
Expand Up @@ -56,6 +56,7 @@ static httpc_api_t httpapi;

/* Exported functions */
static cmd_export_t cmds[] = {
/* Test_http_connect(connection, <URL>, <result pvar>) - HTTP GET */
{"test_http_connect", (cmd_function)w_testcurl_connect, 3, fixup_testcurl_connect,
fixup_free_testcurl_connect,
REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE},
Expand Down Expand Up @@ -123,20 +124,24 @@ static void destroy(void)


/*
* Fix curl_connect params: connection(string/pvar) url (string that may contain pvars) and
* result (writable pvar).
* Fix test_curl_connect params:
* 1. connection(string/pvar)
* 2. url (string that may contain pvars) and
* 3. result (writable pvar).
*/
static int fixup_testcurl_connect(void** param, int param_no)
{

/* 1. Connection */
if (param_no == 1) {
/* We want char * strings */
return 0;
}
/* URL and data may contain pvar */
/* 2. URL and data may contain pvar */
if (param_no == 2) {
return fixup_spve_null(param, 1);
}
/* 3. PVAR for result */
if (param_no == 3) {
if (fixup_pvar_null(param, 1) != 0) {
LM_ERR("failed to fixup result pvar\n");
Expand Down
6 changes: 3 additions & 3 deletions test/mod_httpapitest/test/curlapi.cfg
Expand Up @@ -5,7 +5,7 @@
#
#

debug=3
debug=2
log_stderror=yes
fork=no

Expand Down Expand Up @@ -55,12 +55,12 @@ onsend_route
# This route is executed at Kamailio start
event_route[htable:mod-init]
{
xlog("L_ERR", "### Kamailio starting $timef(HH:mm) \n");
xlog("L_ERR", "### Kamailio starting $timef(%HH:%mm) \n");
$var(html) = "";

$var(res) = test_http_connect("lisa", "", "$avp(html)");

xlog("L_ERR", "-- Lisa http_client connection: $avp(gurka) Result $var(res)\n");
xlog("L_ERR", "-- Lisa http_client connection: Result $var(res) Response:\n--------\n$avp(html)\n------\n");


}
Expand Down

0 comments on commit ee14cf1

Please sign in to comment.