Merge pull request #11 from lwindg/master

1.0.1-3 & 1.0.1-2's change.

debian/changelog

@@ -1,4 +1,16 @@
-sanji-controller (1.0.0-2) unstable; urgency=low
+sanji-controller (1.0.1-3) unstable; urgency=low
+
+  * Sleep more longer (reconnect).
+
+ -- Aeluin Chen <[email protected]>  Fri, 12 Jun 2015 15:45:17 +0800
+
+sanji-controller (1.0.1-2) unstable; urgency=low
+
+  * Remove "-controller" from client id if using local id.
+
+ -- Aeluin Chen <[email protected]>  Tue, 09 Jun 2015 15:30:58 +0800
+
+sanji-controller (1.0.1-1) unstable; urgency=low
 
   * Using config file and option arguments instead of environment variable
     for local id.

src/sanji_controller.c

@@ -387,7 +387,7 @@ struct sanji_userdata *sanji_userdata_init(struct sanji_config *config)
 
 		/* overwrite client_id */
 		if (config->client_id == NULL)
-			sprintf(ud->client_id, "%s-%s", config->local_id, SANJI_ID_SUFFIX);
+			sprintf(ud->client_id, "%s", config->local_id);
 
 		/* set /{local_id}/SANJI_CONTROLLER_TOPIC topic */
 		ud->topic_count++;

src/sanji_controller.h

@@ -34,7 +34,7 @@ extern "C" {
 #define SANJI_CONTROLLER_TOPIC "/controller"
 #define SANJI_CONTROLLER_TOPIC_LEN 11
 #define SANJI_TOPIC_MAX_LEN 256
-#define SANJI_LOCAL_ID_LEN MOSQ_MQTT_ID_MAX_LENGTH - SANJI_ID_SUFFIX_LEN
+#define SANJI_LOCAL_ID_LEN MOSQ_MQTT_ID_MAX_LENGTH
 
 
 /* build-in model topics and resources */