jsonopen fix

Author: chatscriptnlp

SRC/common.h

@@ -34,18 +34,7 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #define NOMAIN 1
 #endif
 
-#ifdef  LOEBNER
-#define DISCARDSERVER 1
-#define DISCARDTCPOPEN 1
-#define DISCARDMYSQL 1
-#define DISCARDPOSTGRES 1
-#define DISCARDMONGO 1
-#define DISCARDCOUNTER 1
-#define DISCARDCLIENT 1
-#define DISCARDJSONOPEN 1
-#define DISCARDJAVASCRIPT 1
-
-#elif WIN32
+#ifdef  WIN32
 //#define USERPATHPREFIX 1
 
 #elif IOS

SRC/evserver.cpp

@@ -303,7 +303,9 @@ int fork_child(ev_child *child_watcher = 0)
 
     // child
     ev_loop_fork(l_g);
+#ifndef DISCARDJSONOPEN
     CurlShutdown();
+#endif
     for (int i = 0; i < cur_children_g; i++)   ev_child_stop(l_g, &children_g[i]);
     cur_children_g = 0;
     parent_g = false;

SRC/json.cpp

@@ -512,6 +512,29 @@ static int my_trace(CURL *handle, curl_infotype type, char *data, size_t size, v
 	return 0;
 }
 
+FunctionResult InitCurl()
+{
+    // Get curl ready -- do this ONCE only during run of CS
+    if (!curl_done_init) {
+#ifdef WIN32
+        if (InitWinsock() == FAILRULE_BIT) // only init winsock one per any use- we might have done this from TCPOPEN or PGCode
+        {
+            ReportBug((char*)"Winsock init failed");
+            return FAILRULE_BIT;
+        }
+#endif
+        curl_global_init(CURL_GLOBAL_SSL);
+        curl_done_init = true;
+    }
+    return NOPROBLEM_BIT;
+}
+
+void CurlShutdown()
+{
+    if (curl_done_init) curl_global_cleanup();
+    curl_done_init = false;
+}
+
 // This is the function we pass to LC, which writes the output to a BufferStruct
 static size_t CurlWriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data) {
 	size_t realsize = size * nmemb;
@@ -532,29 +555,6 @@ static size_t CurlWriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void
 	return realsize;
 }
 
-void CurlShutdown()
-{
-	if (curl_done_init) curl_global_cleanup ();
-	curl_done_init = false;
-}
-
-FunctionResult InitCurl()
-{
-	// Get curl ready -- do this ONCE only during run of CS
-	if (!curl_done_init) {
-#ifdef WIN32
-		if (InitWinsock() == FAILRULE_BIT) // only init winsock one per any use- we might have done this from TCPOPEN or PGCode
-		{
-			ReportBug((char*)"Winsock init failed");
-			return FAILRULE_BIT;
-		}
-#endif
-		curl_global_init(CURL_GLOBAL_SSL);
-		curl_done_init = true;
-	}
-	return NOPROBLEM_BIT;
-}
-
 char* UrlEncodePiece(char* input)
 {
 	InitCurl();

SRC/json.h

@@ -36,18 +36,18 @@ FunctionResult JSONDeleteCode(char* buffer);
 FunctionResult JSONCopyCode(char* buffer);
 FunctionResult JSONCreateCode(char* buffer);
 FunctionResult JSONReadCSVCode(char* buffer);
-FunctionResult InitCurl();
 MEANING GetUniqueJsonComposite(char* prefix);
 MEANING jsonValue(char* value, unsigned int& flags);
 void JsonRenumber(FACT* F);
 void jkillfact(WORDP D);
 void InitJSONNames();
 char* jwrite(char* buffer, WORDP D, int subject);
+FunctionResult InitCurl();
+void CurlShutdown();
 
 #ifndef DISCARDJSONOPEN
 char* UrlEncodePiece(char* input);
 FunctionResult JSONOpenCode(char* buffer);
-void CurlShutdown();
 #endif
 
 #endif

SRC/mainSystem.cpp

@@ -819,7 +819,8 @@ static size_t ConfigCallback(void *contents, size_t size, size_t nmemb, void *us
 }
 
 static void LoadconfigFromUrl(char*configUrl, char**configUrlHeaders, int headerCount){
-	InitCurl();
+#ifndef DISCARDJSONOPEN 
+    InitCurl();
 	CURL *req = curl_easy_init();
 	string response_string;
 	curl_easy_setopt(req, CURLOPT_CUSTOMREQUEST, "GET");
@@ -855,6 +856,7 @@ static void LoadconfigFromUrl(char*configUrl, char**configUrlHeaders, int header
 	    curl_easy_cleanup(req);
 		CurlShutdown();
 	ProcessConfigLines();
+#endif
 }
 
 static void ReadConfig()