Merge pull request #69 from mtl2034/master

adding support for custom server

Author: francip

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT(parse-embedded, 1.0.3, [email protected])
+AC_INIT(parse-embedded, 1.0.4, [email protected])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_SRCDIR(common/simplejson.c)
 AC_CONFIG_SRCDIR(unix/src/parse.c)

openwrt/parse-embedded/Makefile

@@ -10,7 +10,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=parse-embedded
-PKG_VERSION:=1.0.3
+PKG_VERSION:=1.0.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-sdks-$(PKG_VERSION).tar.gz

unix/yun/parse_request.c

@@ -169,7 +169,12 @@ int main(int argc , char **argv) {
     exit(0);
   }
 
-  ParseClient client = parseInitialize(g_cAppID,g_cClientKey);
+  ParseClient client;
+  if (g_cServerURL[0] == '\0') {
+      client = parseInitialize(g_cAppID, g_cClientKey);
+  } else {
+      client = parseInitializeWithServerURL(g_cAppID, g_cClientKey, g_cServerURL);
+  }
 
   if(g_cInstallationID[0] != '\0') {
 	parseSetInstallationId(client, g_cInstallationID);

unix/yun/yun.c

@@ -33,6 +33,7 @@ char g_cAppID[APPLICATION_ID_MAX_LEN + 1] = {0};
 char g_cClientKey[CLIENT_KEY_MAX_LEN + 1] = {0};
 char g_cInstallationID[INSTALLATION_ID_MAX_LEN + 1] ={0};
 char g_cSessionToken[SESSION_TOKEN_MAX_LEN + 1] = {0};
+char g_cServerURL[SERVER_URL_MAX_LEN + 1] = {0};
 
 int yunReadProvisioningInfo() {
   int socketHandle = -1;
@@ -82,6 +83,17 @@ int yunReadProvisioningInfo() {
         strncpy(g_cSessionToken, value, sizeof(g_cSessionToken));
       }
     }
+
+    // read serverURL
+    memset(buf, 0, sizeof(buf));
+    memset(value, 0, sizeof(value));
+    tcp_write(socketHandle, "{\"command\": \"get\", \"key\": \"serverURL\"}\n");
+    if (tcp_read(socketHandle, buf, sizeof(buf) - 1, 2)) {
+      getValueFromJSON(buf, "value", value, sizeof(value));
+      if(strcmp("null", value) != 0) {
+        strncpy(g_cServerURL, value, sizeof(g_cServerURL));
+      }
+    }
     tcp_close(socketHandle);
     return 1;
   } else {

unix/yun/yun.h

@@ -28,6 +28,7 @@ extern char g_cAppID[APPLICATION_ID_MAX_LEN + 1];
 extern char g_cClientKey[CLIENT_KEY_MAX_LEN + 1];
 extern char g_cInstallationID[INSTALLATION_ID_MAX_LEN + 1];
 extern char g_cSessionToken[SESSION_TOKEN_MAX_LEN + 1];
+extern char g_cServerURL[SERVER_URL_MAX_LEN + 1];
 
 int yunReadProvisioningInfo();