pick pull request Mixiaoxiao#231

Author: ruleechen

src/arduino_homekit_server.cpp

@@ -45,7 +45,7 @@
 #define HOMEKIT_SOCKET_KEEPALIVE_INTERVAL_SEC  30
 //const int maxpkt = 4; /* Drop connection after 4 probes without response */
 #define HOMEKIT_SOCKET_KEEPALIVE_IDLE_COUNT     4
-// if 180 + 30 * 4 = 300 sec without socket response, disconected it.
+// if 180 + 30 * 4 = 300 sec without socket response, disconnected it.
 
 // WiFiClient can not write big buff once.
 // TCP_SND_BUF = (2 * TCP_MSS) = 1072. See lwipopts.h
@@ -562,7 +562,7 @@ int client_send_encrypted_(client_context_t *context,
 	memset(nonce, 0, sizeof(nonce));
 
 	byte encrypted[1024 + 18];
-	int payload_offset = 0;
+	uint payload_offset = 0;
 
 	while (payload_offset < size) {
 		size_t chunk_size = size - payload_offset;
@@ -1879,7 +1879,7 @@ void homekit_server_on_get_characteristics(client_context_t *context) {
 
 	query_param_t *qp = context->endpoint_params;
 	while (qp) {
-		CLIENT_DEBUG(context, "Query paramter %s = %s", qp->name, qp->value);
+		CLIENT_DEBUG(context, "Query parameter %s = %s", qp->name, qp->value);
 		qp = qp->next;
 	}
 
@@ -2629,6 +2629,7 @@ void homekit_server_on_pairings(client_context_t *context, const byte *data, siz
 					INFO("Last admin pairing was removed, enabling pair setup");
 					context->server->paired = false;
 					//homekit_setup_mdns(context->server);
+					homekit_storage_reset_pairing_data();
 				}
 			}
 		}
@@ -2763,7 +2764,7 @@ int homekit_server_on_url(http_parser *parser, const char *data, size_t length)
 }
 
 int homekit_server_on_body(http_parser *parser, const char *data, size_t length) {
-	DEBUG("http_parser lenght=%d", length);
+	DEBUG("http_parser length=%d", length);
 	client_context_t *context = (client_context_t*) parser->data;
 	context->body = (char*) realloc(context->body, context->body_length + length + 1);
 	memcpy(context->body + context->body_length, data, length);
@@ -2891,7 +2892,7 @@ void homekit_client_process(client_context_t *context) {
 		}
 		return;
 	}
-	CLIENT_DEBUG(context, "Got %d incomming data, encrypted is %s",
+	CLIENT_DEBUG(context, "Got %d incoming data, encrypted is %s",
 			data_len, context->encrypted ? "true" : "false");
 	byte *payload = (byte*) context->data;
 	size_t payload_size = (size_t) data_len;
@@ -2945,7 +2946,7 @@ void homekit_server_close_client(homekit_server_t *server, client_context_t *con
 
 	if (context->socket) {
 		context->socket->stop();
-		CLIENT_DEBUG(context, "The sockect is stopped");
+		CLIENT_DEBUG(context, "The socket is stopped");
 		delete context->socket;
 		context->socket = nullptr;
 	}
@@ -3021,7 +3022,7 @@ client_context_t* homekit_server_accept_client(homekit_server_t *server) {
 void homekit_server_process_notifications(homekit_server_t *server) {
 	client_context_t *context = server->clients;
 	// 把characteristic_event_t拼接成client_event_t链表
-	// 按照Apple的规定，Nofiy消息需合并发送
+	// 按照Apple的规定，Notify消息需合并发送
 	while (context) {
 		if (context->step != HOMEKIT_CLIENT_STEP_PAIR_VERIFY_2OF2) {
 			// Do not send event when the client is not verify over.
@@ -3117,7 +3118,7 @@ void homekit_server_process(homekit_server_t *server) {
 }
 
 //=====================================================
-// Arduino ESP8266 MDNS: call this funciton only once when WiFi STA is connected!
+// Arduino ESP8266 MDNS: call this function only once when WiFi STA is connected!
 //=====================================================
 bool homekit_mdns_started = false;
 
@@ -3134,22 +3135,19 @@ void homekit_mdns_init(homekit_server_t *server) {
 	}
 
 	homekit_accessory_t *accessory = server->config->accessories[0];
-	homekit_service_t *accessory_info = homekit_service_by_type(accessory,
-	HOMEKIT_SERVICE_ACCESSORY_INFORMATION);
+	homekit_service_t *accessory_info = homekit_service_by_type(accessory, HOMEKIT_SERVICE_ACCESSORY_INFORMATION);
 	if (!accessory_info) {
 		ERROR("Invalid accessory declaration: no Accessory Information service");
 		return;
 	}
 
-	homekit_characteristic_t *name = homekit_service_characteristic_by_type(accessory_info,
-	HOMEKIT_CHARACTERISTIC_NAME);
+	homekit_characteristic_t *name = homekit_service_characteristic_by_type(accessory_info, HOMEKIT_CHARACTERISTIC_NAME);
 	if (!name) {
 		ERROR("Invalid accessory declaration: " "no Name characteristic in AccessoryInfo service");
 		return;
 	}
 
-	homekit_characteristic_t *model = homekit_service_characteristic_by_type(accessory_info,
-	HOMEKIT_CHARACTERISTIC_MODEL);
+	homekit_characteristic_t *model = homekit_service_characteristic_by_type(accessory_info, HOMEKIT_CHARACTERISTIC_MODEL);
 	if (!model) {
 		ERROR("Invalid accessory declaration: " "no Model characteristic in AccessoryInfo service");
 		return;
@@ -3169,8 +3167,7 @@ void homekit_mdns_init(homekit_server_t *server) {
 	MDNS.begin(name->value.string_value, staIP);
 	INFO("MDNS begin: %s, IP: %s", name->value.string_value, staIP.toString().c_str());
 
-	MDNSResponder::hMDNSService mdns_service = MDNS.addService(name->value.string_value,
-	HOMEKIT_MDNS_SERVICE, HOMEKIT_MDNS_PROTO, HOMEKIT_SERVER_PORT);
+	MDNSResponder::hMDNSService mdns_service = MDNS.addService(name->value.string_value, HOMEKIT_MDNS_SERVICE, HOMEKIT_MDNS_PROTO, HOMEKIT_SERVER_PORT);
 	// Set a service specific callback for dynamic service TXT items.
 	// The callback is called, whenever service TXT items are needed for the given service.
 	MDNS.setDynamicServiceTxtCallback(mdns_service,
@@ -3241,7 +3238,7 @@ void homekit_mdns_init(homekit_server_t *server) {
 
 		unsigned char encodedHash[9];
 		memset(encodedHash, 0, sizeof(encodedHash));
-		word32 len = sizeof(encodedHash);
+		// word32 len = sizeof(encodedHash);
 		base64_encode_((const unsigned char*) shaHash, 4, encodedHash);
 		MDNS.addServiceTxt(mdns_service, "sh", (char*) encodedHash);
 	}
@@ -3345,20 +3342,10 @@ void homekit_server_init(homekit_server_config_t *config) {
 	//homekit_server_task(server);
 	INFO("Starting server");
 
-	int r = homekit_storage_init();
-	if (r == 0) {
-		r = homekit_storage_load_accessory_id(server->accessory_id);
-
-		if (!r)
-			r = homekit_storage_load_accessory_key(&server->accessory_key);
-	}
-
-	if (r) {
-		if (r < 0) {
-			INFO("Resetting HomeKit storage");
-			homekit_storage_reset();
-		}
-
+	if (homekit_storage_init(false) != 0 ||
+		homekit_storage_load_accessory_id(server->accessory_id) != 0 ||
+		homekit_storage_load_accessory_key(&server->accessory_key) != 0
+	) {
 		homekit_accessory_id_generate(server->accessory_id);
 		homekit_storage_save_accessory_id(server->accessory_id);
 
@@ -3437,11 +3424,11 @@ int homekit_get_setup_uri(const homekit_server_config_t *config, char *buffer, s
 
 	if (!config->password)
 		return -1;
-	// TODO: validate password in case it is run beffore server is started
+	// TODO: validate password in case it is run before server is started
 
 	if (!config->setupId)
 		return -1;
-	// TODO: validate setupID in case it is run beffore server is started
+	// TODO: validate setupID in case it is run before server is started
 
 	homekit_accessory_t *accessory = homekit_accessory_by_id(config->accessories, 1);
 	if (!accessory)
@@ -3483,8 +3470,8 @@ int homekit_get_setup_uri(const homekit_server_config_t *config, char *buffer, s
 	return 0;
 }
 
-// Pre-initialize the pairing_context used in Pair-Setep 1/3
-// For avoiding timeout caused sockect disconnection from iOS device.
+// Pre-initialize the pairing_context used in Pair-Setup 1/3
+// For avoiding timeout caused socket disconnection from iOS device.
 bool arduino_homekit_preinit(homekit_server_t *server) {
 	if (saved_preinit_pairing_context != nullptr) {
 		return true;