@@ -147,6 +147,8 @@ static int w_http_query_post(

 		struct sip_msg *_m, char *_url, char *_post, char *_result);

 static int w_http_query_post_hdr(struct sip_msg *_m, char *_url, char *_post,

 		char *_hdrs, char *_result);

+static int w_http_query_get_hdr(struct sip_msg *_m, char *_url, char *_body,

+		char *_hdrs, char *_result);

 static int w_curl_connect(

 		struct sip_msg *_m, char *_con, char *_url, char *_result);

@@ -168,6 +170,9 @@ static cmd_export_t cmds[] = {

 	{"http_client_query", (cmd_function)w_http_query_post_hdr, 4, fixup_http_query_post_hdr,

 		fixup_free_http_query_post_hdr,

 		REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE},

+	{"http_client_get", (cmd_function)w_http_query_get_hdr, 4, fixup_http_query_post_hdr,

+		fixup_free_http_query_post_hdr,

+		REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE},

 	{"http_connect", (cmd_function)w_curl_connect, 3, fixup_curl_connect,

 		fixup_free_curl_connect,

 		REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE},

@@ -1002,6 +1007,107 @@ static int w_http_query_post_hdr(

 	return w_http_query_script(_m, _url, _post, _hdrs, _result);

 }

+/*!

+ * helper for HTTP-Query function

+ */

+static int ki_http_request_helper(sip_msg_t *_m, str *met, str *url, str *body,

+		str *hdrs, pv_spec_t *dst)

+{

+	int ret = 0;

+	str result = {NULL, 0};

+	pv_value_t val;

+

+	if(url==NULL || url->s==NULL) {

+		LM_ERR("invalid url parameter\n");

+		return -1;

+	}

+	ret = http_client_request(_m, url->s, &result,

+			(body && body->s && body->len>0)?body->s:NULL,

+			(hdrs && hdrs->s && hdrs->len>0)?hdrs->s:NULL,

+			(met && met->s && met->len>0)?met->s:NULL);

+

+	val.rs = result;

+	val.flags = PV_VAL_STR;

+	if(dst->setf) {

+		dst->setf(_m, &dst->pvp, (int)EQ_T, &val);

+	} else {

+		LM_WARN("target pv is not writable\n");

+	}

+

+	if(result.s != NULL)

+		pkg_free(result.s);

+

+	return (ret == 0) ? -1 : ret;

+}

+

+/*!

+ * KEMI function to perform GET with headers and body

+ */

+static int ki_http_get_hdrs(sip_msg_t *_m, str *url, str *body,

+		str *hdrs, str *dpv)

+{

+	str met = str_init("GET");

+	pv_spec_t *dst;

+

+	dst = pv_cache_get(dpv);

+	if(dst==NULL) {

+		LM_ERR("failed to get pv spec for: %.*s\n", dpv->len, dpv->s);

+		return -1;

+	}

+	if(dst->setf==NULL) {

+		LM_ERR("target pv is not writable: %.*s\n", dpv->len, dpv->s);

+		return -1;

+	}

+

+	return ki_http_request_helper(_m, &met, url, body, hdrs, dst);

+}

+

+/*!

+ * Wrapper for HTTP-Query function for cfg script

+ */

+static int w_http_get_script(sip_msg_t *_m, char *_url, char *_body,

+		char *_hdrs, char *_result)

+{

+	str met = str_init("GET");

+	str url = {NULL, 0};

+	str body = {NULL, 0};

+	str hdrs = {NULL, 0};

+	pv_spec_t *dst;

+

+	if(get_str_fparam(&url, _m, (gparam_p)_url) != 0 || url.len <= 0) {

+		LM_ERR("URL has no value\n");

+		return -1;

+	}

+	if(_body && get_str_fparam(&body, _m, (gparam_p)_body) != 0) {

+		LM_ERR("DATA has no value\n");

+		return -1;

+	} else {

+		if(body.len == 0) {

+			body.s = NULL;

+		}

+	}

+	if(_hdrs && get_str_fparam(&hdrs, _m, (gparam_p)_hdrs) != 0) {

+		LM_ERR("HDRS has no value\n");

+		return -1;

+	} else {

+		if(hdrs.len == 0) {

+			hdrs.s = NULL;

+		}

+	}

+	dst = (pv_spec_t *)_result;

+

+	return ki_http_request_helper(_m, &met, &url, &body, &hdrs, dst);

+}

+

+/*!

+ * Wrapper for HTTP-GET (HDRS-Variant)

+ */

+static int w_http_query_get_hdr(

+		sip_msg_t *_m, char *_url, char *_body, char *_hdrs, char *_result)

+{

+	return w_http_get_script(_m, _url, _body, _hdrs, _result);

+}

+

 /*!

  * Parse arguments to  pv $curlerror

  */

@@ -1149,6 +1255,11 @@ static sr_kemi_t sr_kemi_http_client_exports[] = {

 		{ SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR,

 			SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE }

 	},

+	{ str_init("http_client"), str_init("get_hdrs"),

+		SR_KEMIP_INT, ki_http_get_hdrs,

+		{ SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR,

+			SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE }

+	},

 	{ str_init("http_client"), str_init("curl_connect"),

 		SR_KEMIP_INT, ki_curl_connect,

 		{ SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR,

@@ -894,8 +894,9 @@ static int ki_http_query_helper(sip_msg_t *_m, str *url, str *post, str *hdrs,

 		LM_ERR("invalid url parameter\n");

 		return -1;

 	}

-	ret = http_client_query(_m, url->s, &result, (post && post->s)?post->s:NULL,

-			(hdrs && hdrs->s)?hdrs->s:NULL);

+	ret = http_client_query(_m, url->s, &result,

+			(post && post->s && post->len>0)?post->s:NULL,

+			(hdrs && hdrs->s && hdrs->len>0)?hdrs->s:NULL);

 	val.rs = result;

 	val.flags = PV_VAL_STR;

@@ -100,7 +100,7 @@ unsigned int default_authmethod =

 		CURLAUTH_BASIC

 		| CURLAUTH_DIGEST; /*!< authentication method - Basic, Digest or both */

-char *default_netintrface = 0; /*!< local network interface */

+char *default_netinterface = 0; /*!< local network interface */

 /*!< Default http query result mode

  * - 0: return full result

@@ -100,6 +100,8 @@ unsigned int default_authmethod =

 		CURLAUTH_BASIC

 		| CURLAUTH_DIGEST; /*!< authentication method - Basic, Digest or both */

+char *default_netintrface = 0; /*!< local network interface */

+

 /*!< Default http query result mode

  * - 0: return full result

  * - 1: return first line only */

@@ -204,6 +206,7 @@ static param_export_t params[] = {

 	{"keep_connections", PARAM_INT, &default_keep_connections },

 	{"query_result", PARAM_INT, &default_query_result },

 	{"query_maxdatasize", PARAM_INT, &default_query_maxdatasize },

+	{"netinterface", PARAM_STRING,  &default_netinterface },

 	{0, 0, 0}

 };

@@ -104,6 +104,8 @@ unsigned int default_authmethod =

  * - 0: return full result

  * - 1: return first line only */

 unsigned int default_query_result = 1;

+/*!< Default download size for result of query function. 0=disabled (no limit) */

+unsigned int default_query_maxdatasize = 0;

 str http_client_config_file = STR_NULL;

@@ -201,6 +203,7 @@ static param_export_t params[] = {

 	{"authmethod", PARAM_INT, &default_authmethod },

 	{"keep_connections", PARAM_INT, &default_keep_connections },

 	{"query_result", PARAM_INT, &default_query_result },

+	{"query_maxdatasize", PARAM_INT, &default_query_maxdatasize },

 	{0, 0, 0}

 };

@@ -100,6 +100,11 @@ unsigned int default_authmethod =

 		CURLAUTH_BASIC

 		| CURLAUTH_DIGEST; /*!< authentication method - Basic, Digest or both */

+/*!< Default http query result mode

+ * - 0: return full result

+ * - 1: return first line only */

+unsigned int default_query_result = 1;

+

 str http_client_config_file = STR_NULL;

 static curl_version_info_data *curl_info;

@@ -195,6 +200,7 @@ static param_export_t params[] = {

 	{"httpcon",  PARAM_STRING|USE_FUNC_PARAM, (void*)curl_con_param},

 	{"authmethod", PARAM_INT, &default_authmethod },

 	{"keep_connections", PARAM_INT, &default_keep_connections },

+	{"query_result", PARAM_INT, &default_query_result },

 	{0, 0, 0}

 };

@@ -120,9 +120,13 @@ static int fixup_free_http_query_post_hdr(void **param, int param_no);

 static int fixup_curl_connect(void **param, int param_no);

 static int fixup_free_curl_connect(void **param, int param_no);

 static int fixup_curl_connect_post(void **param, int param_no);

+static int fixup_curl_connect_post_raw(void **param, int param_no);

 static int fixup_free_curl_connect_post(void **param, int param_no);

+static int fixup_free_curl_connect_post_raw(void **param, int param_no);

 static int w_curl_connect_post(struct sip_msg *_m, char *_con, char *_url,

 		char *_result, char *_ctype, char *_data);

+static int w_curl_connect_post_raw(struct sip_msg *_m, char *_con, char *_url,

+		char *_result, char *_ctype, char *_data);

 static int fixup_curl_get_redirect(void **param, int param_no);

 static int fixup_free_curl_get_redirect(void **param, int param_no);

@@ -161,6 +165,9 @@ static cmd_export_t cmds[] = {

 	{"http_connect", (cmd_function)w_curl_connect_post, 5, fixup_curl_connect_post,

 		fixup_free_curl_connect_post,

 		REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE},

+	{"http_connect_raw", (cmd_function)w_curl_connect_post_raw, 5, fixup_curl_connect_post_raw,

+		fixup_free_curl_connect_post_raw,

+		REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE},

 	{"http_get_redirect", (cmd_function)w_curl_get_redirect, 2, fixup_curl_get_redirect,

 		fixup_free_curl_get_redirect,

 		REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE},

@@ -482,6 +489,37 @@ static int fixup_curl_connect_post(void **param, int param_no)

 	return -1;

 }

+/*

+ * Fix curl_connect params when posting (5 parameters): 

+ *	connection (string/pvar), url (string with pvars), content-type, 

+ *      data (string(with no pvar parsing), pvar)

+ */

+static int fixup_curl_connect_post_raw(void **param, int param_no)

+{

+

+	if(param_no == 1 || param_no == 3 || param_no == 4) {

+		/* We want char * strings */

+		return 0;

+	}

+	/* URL and data may contain pvar */

+	if(param_no == 2) {

+		return fixup_spve_null(param, 1);

+	}

+	if(param_no == 5) {

+		if(fixup_pvar_null(param, 1) != 0) {

+			LM_ERR("failed to fixup result pseudo variable\n");

+			return -1;

+		}

+		if(((pv_spec_t *)(*param))->setf == NULL) {

+			LM_ERR("result pvar is not writeable\n");

+			return -1;

+		}

+		return 0;

+	}

+

+	LM_ERR("invalid parameter number <%d>\n", param_no);

+	return -1;

+}

 /*

  * Free curl_connect params.

@@ -504,6 +542,27 @@ static int fixup_free_curl_connect_post(void **param, int param_no)

 	return -1;

 }

+/*

+ * Free curl_connect params.

+ */

+static int fixup_free_curl_connect_post_raw(void **param, int param_no)

+{

+	if(param_no == 1 || param_no == 3 || param_no == 4) {

+		/* Char strings don't need freeing */

+		return 0;

+	}

+	if(param_no == 2) {

+		return fixup_free_spve_null(param, 1);

+	}

+

+	if(param_no == 5) {

+		return fixup_free_pvar_null(param, 1);

+	}

+

+	LM_ERR("invalid parameter number <%d>\n", param_no);

+	return -1;

+}

+

 /*

  * Free curl_connect params.

  */

@@ -645,6 +704,44 @@ static int ki_curl_connect_post(sip_msg_t *_m, str *con, str *url,

 	return ki_curl_connect_post_helper(_m, con, url, ctype, data, dst);

 }

+/*

+ * Wrapper for Curl_connect (POST) raw data (no pvar parsing inside the data)

+ */

+static int w_curl_connect_post_raw(struct sip_msg *_m, char *_con, char *_url,

+		char *_ctype, char *_data, char *_result)

+{

+	str con = {NULL, 0};

+	str url = {NULL, 0};

+	str ctype = {NULL, 0};

+	str data = {NULL, 0};

+	pv_spec_t *dst;

+

+	if(_con == NULL || _url == NULL || _ctype==NULL || _data == NULL

+			|| _result == NULL) {

+		LM_ERR("http_connect: Invalid parameters\n");

+		return -1;

+	}

+	con.s = _con;

+	con.len = strlen(con.s);

+

+	if(get_str_fparam(&url, _m, (gparam_p)_url) != 0) {

+		LM_ERR("http_connect: URL has no value\n");

+		return -1;

+	}

+

+	ctype.s = _ctype;

+	ctype.len = strlen(ctype.s);

+

+	data.s = _data;

+	data.len = strlen(data.s);

+

+	LM_DBG("**** HTTP_CONNECT: Connection %s URL %s Result var %s\n", _con,

+			_url, _result);

+	dst = (pv_spec_t *)_result;

+

+	return ki_curl_connect_post_helper(_m, &con, &url, &ctype, &data, dst);

+}

+

 /*

  * Wrapper for Curl_connect (POST)

  */

@@ -1058,4 +1155,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2)

 {

 	sr_kemi_modules_add(sr_kemi_http_client_exports);

 	return 0;

-}

\ No newline at end of file

+}

@@ -204,18 +204,16 @@ static pv_export_t mod_pvs[] = {

 /* Module interface */

 struct module_exports exports = {

-	"http_client",

-	DEFAULT_DLFLAGS, /* dlopen flags */

-	cmds,      /* Exported functions */

-	params,    /* Exported parameters */

-	0,         /* exported statistics */

-	0,         /* exported MI functions */

-	mod_pvs,         /* exported pseudo-variables */

-	0,         /* extra processes */

-	mod_init,  /* module initialization function */

-	0,         /* response function*/

-	destroy,   /* destroy function */

-	child_init /* per-child init function */

+	"http_client",		/* module name */

+	DEFAULT_DLFLAGS,	/* dlopen flags */

+	cmds,				/* exported functions */

+	params,				/* exported parameters */

+	0,					/* RPC method exports */

+	mod_pvs,					/* exported pseudo-variables */

+	0,					/* response handling function */

+	mod_init,			/* module initialization function */

+	child_init,			/* per-child init function */

+	destroy				/* module destroy function */

 };

 /* clang-format on */

@@ -186,7 +186,7 @@ static param_export_t params[] = {

 	{"maxdatasize", PARAM_INT,  &default_maxdatasize },

 	{"config_file", PARAM_STR,  &http_client_config_file },

 	{"httpcon",  PARAM_STRING|USE_FUNC_PARAM, (void*)curl_con_param},

-	{"authmetod", PARAM_INT, &default_authmethod },

+	{"authmethod", PARAM_INT, &default_authmethod },

 	{"keep_connections", PARAM_INT, &default_keep_connections },

 	{0, 0, 0}

 };

@@ -561,7 +561,7 @@ static int ki_curl_connect(sip_msg_t *_m, str *con, str *url, str *dpv)

 	pv_spec_t *dst;

 	dst = pv_cache_get(dpv);

-	if(dpv==NULL) {

+	if(dst==NULL) {

 		LM_ERR("failed to get pv spec for: %.*s\n", dpv->len, dpv->s);

 		return -1;

 	}

@@ -635,7 +635,7 @@ static int ki_curl_connect_post(sip_msg_t *_m, str *con, str *url,

 	pv_spec_t *dst;

 	dst = pv_cache_get(dpv);

-	if(dpv==NULL) {

+	if(dst==NULL) {

 		LM_ERR("failed to get pv spec for: %.*s\n", dpv->len, dpv->s);

 		return -1;

 	}

@@ -810,7 +810,7 @@ static int ki_http_query_post_hdrs(sip_msg_t *_m, str *url, str *post, str *hdrs

 	pv_spec_t *dst;

 	dst = pv_cache_get(dpv);

-	if(dpv==NULL) {

+	if(dst==NULL) {

 		LM_ERR("failed to get pv spec for: %.*s\n", dpv->len, dpv->s);

 		return -1;

 	}

@@ -61,6 +61,7 @@

 #include "../../core/config.h"

 #include "../../core/lvalue.h"

 #include "../../core/pt.h" /* Process table */

+#include "../../core/kemi.h"

 #include "functions.h"

 #include "curlcon.h"

@@ -529,16 +530,57 @@ static int fixup_free_curl_connect(void **param, int param_no)

 /*

  * Wrapper for Curl_connect (GET)

  */

-static int w_curl_connect(

-		struct sip_msg *_m, char *_con, char *_url, char *_result)

+static int ki_curl_connect_helper(sip_msg_t *_m, str *con, str *url,

+		pv_spec_t *dst)

 {

+	str result = {NULL, 0};

+	pv_value_t val;

+	int ret = 0;

+

+	ret = curl_con_query_url(_m, con, url, &result, NULL, NULL);

+

+	val.rs = result;

+	val.flags = PV_VAL_STR;

+	if(dst->setf) {

+		dst->setf(_m, &dst->pvp, (int)EQ_T, &val);

+	} else {

+		LM_WARN("target pv is not writable\n");

+	}

+	if(result.s != NULL)

+		pkg_free(result.s);

+

+	return (ret == 0) ? -1 : ret;

+}

+

+/*

+ * Kemi wrapper for Curl_connect (GET)

+ */

+static int ki_curl_connect(sip_msg_t *_m, str *con, str *url, str *dpv)

+{

+	pv_spec_t *dst;

+

+	dst = pv_cache_get(dpv);

+	if(dpv==NULL) {

+		LM_ERR("failed to get pv spec for: %.*s\n", dpv->len, dpv->s);

+		return -1;

+	}

+	if(dst->setf==NULL) {

+		LM_ERR("target pv is not writable: %.*s\n", dpv->len, dpv->s);

+		return -1;

+	}

+

+	return ki_curl_connect_helper(_m, con, url, dst);

+}

+

+/*

+ * Cfg wrapper for Curl_connect (GET)

+ */

+static int w_curl_connect(sip_msg_t *_m, char *_con, char *_url, char *_result)

+{

 	str con = {NULL, 0};

 	str url = {NULL, 0};

-	str result = {NULL, 0};

 	pv_spec_t *dst;

-	pv_value_t val;

-	int ret = 0;

 	if(_con == NULL || _url == NULL || _result == NULL) {

 		LM_ERR("http_connect: Invalid parameter\n");

@@ -546,7 +588,6 @@ static int w_curl_connect(

 	}

 	con.s = _con;

 	con.len = strlen(con.s);

-

 	if(get_str_fparam(&url, _m, (gparam_p)_url) != 0) {

 		LM_ERR("http_connect: url has no value\n");

 		return -1;

@@ -554,13 +595,30 @@ static int w_curl_connect(

 	LM_DBG("**** HTTP_CONNECT Connection %s URL %s Result var %s\n", _con, _url,

 			_result);

+	dst = (pv_spec_t *)_result;

-	ret = curl_con_query_url(_m, &con, &url, &result, NULL, NULL);

+	return ki_curl_connect_helper(_m, &con, &url, dst);

+}

+

+/*

+ * Wrapper for Curl_connect (POST)

+ */

+static int ki_curl_connect_post_helper(sip_msg_t *_m, str *con, str *url,

+		str *ctype, str *data, pv_spec_t *dst)

+{

+	str result = {NULL, 0};

+	pv_value_t val;

+	int ret = 0;

+

+	ret = curl_con_query_url(_m, con, url, &result, ctype->s, data);

 	val.rs = result;

 	val.flags = PV_VAL_STR;

-	dst = (pv_spec_t *)_result;

-	dst->setf(_m, &dst->pvp, (int)EQ_T, &val);

+	if(dst->setf) {

+		dst->setf(_m, &dst->pvp, (int)EQ_T, &val);

+	} else {

+		LM_WARN("target pv is not writtable\n");

+	}

 	if(result.s != NULL)

 		pkg_free(result.s);

@@ -568,6 +626,27 @@ static int w_curl_connect(

 	return (ret == 0) ? -1 : ret;

 }

+/*

+ * Kemi wrapper for Curl_connect (POST)

+ */

+static int ki_curl_connect_post(sip_msg_t *_m, str *con, str *url,

+		str *ctype, str *data, str *dpv)

+{

+	pv_spec_t *dst;

+

+	dst = pv_cache_get(dpv);

+	if(dpv==NULL) {

+		LM_ERR("failed to get pv spec for: %.*s\n", dpv->len, dpv->s);

+		return -1;

+	}

+	if(dst->setf==NULL) {

+		LM_ERR("target pv is not writable: %.*s\n", dpv->len, dpv->s);

+		return -1;

+	}

+

+	return ki_curl_connect_post_helper(_m, con, url, ctype, data, dst);

+}

+

 /*

  * Wrapper for Curl_connect (POST)

  */

@@ -576,13 +655,12 @@ static int w_curl_connect_post(struct sip_msg *_m, char *_con, char *_url,

 {

 	str con = {NULL, 0};

 	str url = {NULL, 0};

+	str ctype = {NULL, 0};

 	str data = {NULL, 0};

-	str result = {NULL, 0};

 	pv_spec_t *dst;

-	pv_value_t val;

-	int ret = 0;

-	if(_con == NULL || _url == NULL || _data == NULL || _result == NULL) {

+	if(_con == NULL || _url == NULL || _ctype==NULL || _data == NULL

+			|| _result == NULL) {

 		LM_ERR("http_connect: Invalid parameters\n");

 		return -1;

 	}

@@ -593,6 +671,10 @@ static int w_curl_connect_post(struct sip_msg *_m, char *_con, char *_url,

 		LM_ERR("http_connect: URL has no value\n");

 		return -1;

 	}

+

+	ctype.s = _ctype;

+	ctype.len = strlen(ctype.s);

+

 	if(get_str_fparam(&data, _m, (gparam_p)_data) != 0) {

 		LM_ERR("http_connect: No post data given\n");

 		return -1;

@@ -600,21 +682,11 @@ static int w_curl_connect_post(struct sip_msg *_m, char *_con, char *_url,

 	LM_DBG("**** HTTP_CONNECT: Connection %s URL %s Result var %s\n", _con,

 			_url, _result);

-

-	ret = curl_con_query_url(_m, &con, &url, &result, _ctype, &data);

-

-	val.rs = result;

-	val.flags = PV_VAL_STR;

 	dst = (pv_spec_t *)_result;

-	dst->setf(_m, &dst->pvp, (int)EQ_T, &val);

-	if(result.s != NULL)

-		pkg_free(result.s);

-

-	return (ret == 0) ? -1 : ret;

+	return ki_curl_connect_post_helper(_m, &con, &url, &ctype, &data, dst);

 }

-

 /*!

  * Fix http_query params: url (string that may contain pvars) and

  * result (writable pvar).

@@ -702,18 +774,74 @@ static int fixup_free_http_query_post_hdr(void **param, int param_no)

 }

 /*!

- * Wrapper for HTTP-Query function for cfg script

+ * helper for HTTP-Query function

  */

-static int w_http_query_script(

-		sip_msg_t *_m, char *_url, char *_post, char *_hdrs, char *_result)

+static int ki_http_query_helper(sip_msg_t *_m, str *url, str *post, str *hdrs,

+		pv_spec_t *dst)

 {

 	int ret = 0;

+	str result = {NULL, 0};

+	pv_value_t val;

+

+	if(url==NULL || url->s==NULL) {

+		LM_ERR("invalid url parameter\n");

+		return -1;

+	}

+	ret = http_client_query(_m, url->s, &result, (post && post->s)?post->s:NULL,

+			(hdrs && hdrs->s)?hdrs->s:NULL);

+

+	val.rs = result;

+	val.flags = PV_VAL_STR;

+	if(dst->setf) {

+		dst->setf(_m, &dst->pvp, (int)EQ_T, &val);

+	} else {

+		LM_WARN("target pv is not writable\n");

+	}

+

+	if(result.s != NULL)

+		pkg_free(result.s);

+

+	return (ret == 0) ? -1 : ret;

+}

+

+static int ki_http_query_post_hdrs(sip_msg_t *_m, str *url, str *post, str *hdrs,

+		str *dpv)

+{

+	pv_spec_t *dst;

+

+	dst = pv_cache_get(dpv);

+	if(dpv==NULL) {

+		LM_ERR("failed to get pv spec for: %.*s\n", dpv->len, dpv->s);

+		return -1;

+	}

+	if(dst->setf==NULL) {

+		LM_ERR("target pv is not writable: %.*s\n", dpv->len, dpv->s);

+		return -1;

+	}

+

+	return ki_http_query_helper(_m, url, post, hdrs, dst);

+}

+

+static int ki_http_query_post(sip_msg_t *_m, str *url, str *post, str *dpv)

+{

+	return ki_http_query_post_hdrs(_m, url, post, NULL, dpv);

+}

+

+static int ki_http_query(sip_msg_t *_m, str *url, str *dpv)

+{

+	return ki_http_query_post_hdrs(_m, url, NULL, NULL, dpv);

+}

+

+/*!

+ * Wrapper for HTTP-Query function for cfg script

+ */

+static int w_http_query_script(sip_msg_t *_m, char *_url, char *_post,

+		char *_hdrs, char *_result)

+{

 	str url = {NULL, 0};

 	str post = {NULL, 0};

 	str hdrs = {NULL, 0};

-	str result = {NULL, 0};

 	pv_spec_t *dst;

-	pv_value_t val;

 	if(get_str_fparam(&url, _m, (gparam_p)_url) != 0 || url.len <= 0) {

 		LM_ERR("URL has no value\n");

@@ -735,18 +863,9 @@ static int w_http_query_script(

 			hdrs.s = NULL;

 		}

 	}

-

-	ret = http_client_query(_m, url.s, &result, post.s, hdrs.s);

-

-	val.rs = result;

-	val.flags = PV_VAL_STR;

 	dst = (pv_spec_t *)_result;

-	dst->setf(_m, &dst->pvp, (int)EQ_T, &val);

-

-	if(result.s != NULL)

-		pkg_free(result.s);

-	return (ret == 0) ? -1 : ret;

+	return ki_http_query_helper(_m, &url, &post, &hdrs, dst);

 }

 /*!

@@ -900,4 +1019,45 @@ static int w_curl_get_redirect(struct sip_msg *_m, char *_con, char *_result)

 		pkg_free(result.s);

 	return ret;

+}

+

+/**

+ *

+ */

+/* clang-format off */

+static sr_kemi_t sr_kemi_http_client_exports[] = {

+	{ str_init("http_client"), str_init("query"),

+		SR_KEMIP_INT, ki_http_query,

+		{ SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

+			SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }

+	},

+	{ str_init("http_client"), str_init("query_post"),

+		SR_KEMIP_INT, ki_http_query_post,

+		{ SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR,

+			SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }

+	},

+	{ str_init("http_client"), str_init("query_post_hdrs"),

+		SR_KEMIP_INT, ki_http_query_post_hdrs,

+		{ SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR,

+			SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE }

+	},

+	{ str_init("http_client"), str_init("curl_connect"),

+		SR_KEMIP_INT, ki_curl_connect,

+		{ SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR,

+			SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }

+	},

+	{ str_init("http_client"), str_init("curl_connect_post"),

+		SR_KEMIP_INT, ki_curl_connect_post,

+		{ SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR,

+			SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE }

+	},

+

+	{ {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } }

+};

+/* clang-format on */

+

+int mod_register(char *path, int *dlflags, void *p1, void *p2)

+{

+	sr_kemi_modules_add(sr_kemi_http_client_exports);

+	return 0;

 }

\ No newline at end of file

@@ -60,7 +60,7 @@

 #include "../../core/rpc_lookup.h"

 #include "../../core/config.h"

 #include "../../core/lvalue.h"

-#include "../../core/pt.h"		/* Process table */

+#include "../../core/pt.h" /* Process table */

 #include "functions.h"

 #include "curlcon.h"

@@ -69,27 +69,37 @@

 MODULE_VERSION

-#define CURL_USER_AGENT  NAME  " (" VERSION " (" ARCH "/" OS_QUOTED "))"

-#define CURL_USER_AGENT_LEN (sizeof(CURL_USER_AGENT)-1)

+#define CURL_USER_AGENT NAME " (" VERSION " (" ARCH "/" OS_QUOTED "))"

+#define CURL_USER_AGENT_LEN (sizeof(CURL_USER_AGENT) - 1)

 /* Module parameter variables */

-unsigned int	default_connection_timeout = 4;

-char		*default_tls_cacert = NULL;		/*!< File name: Default CA cert to use for curl TLS connection */

-str		default_tls_clientcert = STR_NULL;	/*!< File name: Default client certificate to use for curl TLS connection */

-str		default_tls_clientkey = STR_NULL;	/*!< File name: Key in PEM format that belongs to client cert */

-str		default_cipher_suite_list = STR_NULL;	/*!< List of allowed cipher suites */

-unsigned int	default_tls_version = 0;		/*!< 0 = Use libcurl default */

-unsigned int	default_tls_verify_peer = 1;		/*!< 0 = Do not verify TLS server cert. 1 = Verify TLS cert (default) */

-unsigned int	default_tls_verify_host = 2;		/*!< 0 = Do not verify TLS server CN/SAN  2 = Verify TLS server CN/SAN (default) */

-str 		default_http_proxy = STR_NULL;		/*!< Default HTTP proxy to use */

-unsigned int	default_http_proxy_port = 0;		/*!< Default HTTP proxy port to use */

-unsigned int	default_http_follow_redirect = 0;	/*!< Follow HTTP redirects CURLOPT_FOLLOWLOCATION */

-unsigned int	default_keep_connections = 0;		/*!< Keep http connections open for reuse */

-str 		default_useragent = { CURL_USER_AGENT, CURL_USER_AGENT_LEN };	/*!< Default CURL useragent. Default "Kamailio Curl " */

-unsigned int	default_maxdatasize = 0;		/*!< Default download size. 0=disabled */

-unsigned int 	default_authmethod = CURLAUTH_BASIC | CURLAUTH_DIGEST;		/*!< authentication method - Basic, Digest or both */

-

-str		http_client_config_file = STR_NULL;

+unsigned int default_connection_timeout = 4;

+char *default_tls_cacert =

+		NULL; /*!< File name: Default CA cert to use for curl TLS connection */

+str default_tls_clientcert =

+		STR_NULL; /*!< File name: Default client certificate to use for curl TLS connection */

+str default_tls_clientkey =

+		STR_NULL; /*!< File name: Key in PEM format that belongs to client cert */

+str default_cipher_suite_list = STR_NULL; /*!< List of allowed cipher suites */

+unsigned int default_tls_version = 0;	 /*!< 0 = Use libcurl default */

+unsigned int default_tls_verify_peer =

+		1; /*!< 0 = Do not verify TLS server cert. 1 = Verify TLS cert (default) */

+unsigned int default_tls_verify_host =

+		2;								  /*!< 0 = Do not verify TLS server CN/SAN  2 = Verify TLS server CN/SAN (default) */

+str default_http_proxy = STR_NULL;		  /*!< Default HTTP proxy to use */

+unsigned int default_http_proxy_port = 0; /*!< Default HTTP proxy port to use */

+unsigned int default_http_follow_redirect =

+		0; /*!< Follow HTTP redirects CURLOPT_FOLLOWLOCATION */

+unsigned int default_keep_connections =

+		0; /*!< Keep http connections open for reuse */

+str default_useragent = {CURL_USER_AGENT,

+		CURL_USER_AGENT_LEN}; /*!< Default CURL useragent. Default "Kamailio Curl " */

+unsigned int default_maxdatasize = 0; /*!< Default download size. 0=disabled */

+unsigned int default_authmethod =

+		CURLAUTH_BASIC

+		| CURLAUTH_DIGEST; /*!< authentication method - Basic, Digest or both */

+

+str http_client_config_file = STR_NULL;

 static curl_version_info_data *curl_info;

@@ -99,37 +109,40 @@ static int child_init(int);

 static void destroy(void);

 /* Fixup functions to be defined later */

-static int fixup_http_query_get(void** param, int param_no);

-static int fixup_free_http_query_get(void** param, int param_no);

-static int fixup_http_query_post(void** param, int param_no);

-static int fixup_free_http_query_post(void** param, int param_no);

-static int fixup_http_query_post_hdr(void** param, int param_no);

-static int fixup_free_http_query_post_hdr(void** param, int param_no);

-

-static int fixup_curl_connect(void** param, int param_no);

-static int fixup_free_curl_connect(void** param, int param_no);

-static int fixup_curl_connect_post(void** param, int param_no);

-static int fixup_free_curl_connect_post(void** param, int param_no);

-static int w_curl_connect_post(struct sip_msg* _m, char* _con, char * _url,

-		char* _result, char* _ctype, char* _data);

-

-static int fixup_curl_get_redirect(void** param, int param_no);

-static int fixup_free_curl_get_redirect(void** param, int param_no);

-static int w_curl_get_redirect(struct sip_msg* _m, char* _con, char* _result);

+static int fixup_http_query_get(void **param, int param_no);

+static int fixup_free_http_query_get(void **param, int param_no);

+static int fixup_http_query_post(void **param, int param_no);

+static int fixup_free_http_query_post(void **param, int param_no);

+static int fixup_http_query_post_hdr(void **param, int param_no);

+static int fixup_free_http_query_post_hdr(void **param, int param_no);

+

+static int fixup_curl_connect(void **param, int param_no);

+static int fixup_free_curl_connect(void **param, int param_no);

+static int fixup_curl_connect_post(void **param, int param_no);

+static int fixup_free_curl_connect_post(void **param, int param_no);

+static int w_curl_connect_post(struct sip_msg *_m, char *_con, char *_url,

+		char *_result, char *_ctype, char *_data);

+

+static int fixup_curl_get_redirect(void **param, int param_no);

+static int fixup_free_curl_get_redirect(void **param, int param_no);

+static int w_curl_get_redirect(struct sip_msg *_m, char *_con, char *_result);