http_client Change names of counters and RPC call

modules/http_client/README

@@ -56,13 +56,13 @@ Carsten Bock
 
         6. RPC Commands
 
-              6.1. curl.listcon
+              6.1. httpclient.listcon
 
         7. Counters
 
-              7.1. curl.connections
-              7.2. curl.connok
-              7.3. curl.connfail
+              7.1. httpclient.connections
+              7.2. httpclient.connok
+              7.3. httpclient.connfail
 
    List of Examples
 
@@ -115,13 +115,13 @@ Chapter 1. Admin Guide
 
    6. RPC Commands
 
-        6.1. curl.listcon
+        6.1. httpclient.listcon
 
    7. Counters
 
-        7.1. curl.connections
-        7.2. curl.connok
-        7.3. curl.connfail
+        7.1. httpclient.connections
+        7.2. httpclient.connok
+        7.3. httpclient.connfail
 
 1. Overview
 
@@ -458,29 +458,29 @@ switch ($retcode) {
 
 6. RPC Commands
 
-   6.1. curl.listcon
+   6.1. httpclient.listcon
 
-6.1. curl.listcon
+6.1. httpclient.listcon
 
-   Lists all defined CURL connections
+   Lists all defined connections
 
    Parameters:
      * No parameters
 
 7. Counters
 
-   7.1. curl.connections
-   7.2. curl.connok
-   7.3. curl.connfail
+   7.1. httpclient.connections
+   7.2. httpclient.connok
+   7.3. httpclient.connfail
 
-7.1. curl.connections
+7.1. httpclient.connections
 
    The number of connection definitions that are in-memory.
 
-7.2. curl.connok
+7.2. httpclient.connok
 
    The number of successful connections since Kamailio start
 
-7.3. curl.connfail
+7.3. httpclient.connfail
 
    The number of failed connections since Kamailio start

modules/http_client/curlrpc.c

@@ -89,7 +89,7 @@ static void curl_rpc_listcon(rpc_t* rpc, void* ctx)
 }
 
 rpc_export_t curl_rpc_cmds[] = {
-	{"curl.listcon",   curl_rpc_listcon,
+	{"httpclient.listcon",   curl_rpc_listcon,
 		curl_rpc_listcon_doc,   0},
 	{0, 0, 0, 0}
 };

modules/http_client/doc/http_client_admin.xml

@@ -495,9 +495,9 @@ switch ($retcode) {
 	<section>
         <title>RPC Commands</title>
 		<section>
-			<title><function moreinfo="none">curl.listcon</function></title>
+			<title><function moreinfo="none">httpclient.listcon</function></title>
 			<para>
-				Lists all defined CURL connections
+				Lists all defined connections
 			</para>
 		<para>Parameters:</para>
 		<itemizedlist>
@@ -510,23 +510,23 @@ switch ($retcode) {
 	<title>Counters</title>
 		<section >
 			<title>
-				<function moreinfo="none">curl.connections</function>
+				<function moreinfo="none">httpclient.connections</function>
 			</title>
 			<para>
 				The number of connection definitions that are in-memory.
 			</para>
 		</section>
 		<section >
 			<title>
-				<function moreinfo="none">curl.connok</function>
+				<function moreinfo="none">httpclient.connok</function>
 			</title>
 			<para>
 				The number of successful connections since &kamailio; start
 			</para>
 		</section>
 		<section >
 			<title>
-				<function moreinfo="none">curl.connfail</function>
+				<function moreinfo="none">httpclient.connfail</function>
 			</title>
 			<para>
 				The number of failed connections since &kamailio; start

modules/http_client/http_client.c

@@ -204,9 +204,9 @@ static void destroy_shmlock(void)
 /* Init counters */
 static void curl_counter_init()
 {
-        counter_register(&connections, "curl", "connections", 0, 0, 0, "Counter of connection definitions (curlcon)", 0);
-        counter_register(&connok, "curl", "connok", 0, 0, 0, "Counter of successful connections (200 OK)", 0);
-        counter_register(&connfail, "curl", "connfail", 0, 0, 0, "Counter of failed connections (not 200 OK)", 0);
+        counter_register(&connections, "httpclient", "connections", 0, 0, 0, "Counter of connection definitions (curlcon)", 0);
+        counter_register(&connok, "httpclient", "connok", 0, 0, 0, "Counter of successful connections (200 OK)", 0);
+        counter_register(&connfail, "httpclient", "connfail", 0, 0, 0, "Counter of failed connections (not 200 OK)", 0);
 }