diff --git a/config/cwmp_xmpp b/config/cwmp_xmpp
index 2ff879b..1c200ea 100644
--- a/config/cwmp_xmpp
+++ b/config/cwmp_xmpp
@@ -13,7 +13,7 @@ config xmpp_connection
 	option password ''
 	option domain 	''
 	option resource ''
-	option interval '300'
+	option interval '30'
 	option attempt '16'
 	option initial_retry_interval ''
 	option retry_interval_multiplier ''
diff --git a/dm/dmtree/common/xmpp.c b/dm/dmtree/common/xmpp.c
index 5659c68..644f4be 100644
--- a/dm/dmtree/common/xmpp.c
+++ b/dm/dmtree/common/xmpp.c
@@ -81,7 +81,7 @@ int add_xmpp_connection(char *refparam, struct dmctx *ctx, void *data, char **in
 	dmasprintf(instancepara, "%d", atoi(last_inst)+1);
 	dmuci_set_value_by_section(xmpp_connection, "connection_instance", *instancepara);
 	dmuci_set_value_by_section(xmpp_connection, "enable", "0");
-	dmuci_set_value_by_section(xmpp_connection, "interval", "300");
+	dmuci_set_value_by_section(xmpp_connection, "interval", "30");
 	dmuci_set_value_by_section(xmpp_connection, "attempt", "16");
 	dmuci_set_value_by_section(xmpp_connection, "serveralgorithm", "DNS-SRV");
 	dmuci_set_value_by_section(xmpp_connection_server, "id_connection", *instancepara);
diff --git a/dm/dmtree/common/xmpp.h b/dm/dmtree/common/xmpp.h
index f3cfaf1..c02e5da 100644
--- a/dm/dmtree/common/xmpp.h
+++ b/dm/dmtree/common/xmpp.h
@@ -25,21 +25,6 @@ int browsexmpp_connection_serverInst(struct dmctx *dmctx, DMNODE *parent_node, v
 int add_xmpp_connection(char *refparam, struct dmctx *ctx, void *data, char **instancepara);
 int delete_xmpp_connection(char *refparam, struct dmctx *ctx, void *data, char *instance, unsigned char del_action);
 
-char *get_xmppconnection_enable(char *instance);
-char *get_xmppconnection_server_enable(char *instance);
-char *get_xmpp_username(char *instance);
-char *get_xmpp_password(char *instance);
-char *get_xmpp_domain(char *instance);
-char *get_xmpp_resource(char *instance);
-char *get_xmpp_keepalive_interval(char *instance);
-char *get_xmpp_connect_attempts(char *instance);
-char *get_xmpp_connect_initial_retry_interval(char *instance);
-char *get_xmpp_connect_retry_interval_multiplier(char *instance);
-char *get_xmpp_connect_retry_max_interval(char *instance);
-char *get_xmpp_serveralgorithm(char *instance);
-char *get_xmpp_server_address(char *instance);
-char *get_xmpp_port(char *instance);
-
 int get_xmpp_connection_nbr_entry(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value);
 int get_xmpp_connection_supported_server_connect_algorithms(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value);
 int get_connection_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value);
diff --git a/xmpp/xmpp.c b/xmpp/xmpp.c
index 2d9a9fd..57dcb18 100644
--- a/xmpp/xmpp.c
+++ b/xmpp/xmpp.c
@@ -141,35 +141,13 @@ int check_xmpp_authorized(char *from)
 
 static int cr_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza1, void * const userdata)
 {
-	time_t current_time;
-	static int request = 0;
-    static time_t restrict_start_time = 0;
 	xmpp_ctx_t *ctx = (xmpp_ctx_t*)userdata;
 	char *name_space, *text, *from, *username, *password;
 	xmpp_stanza_t *child, *mech;
-	bool valid_ns = true, auth_status = false, service_available = false, permitted = true;
+	bool valid_ns = true, auth_status = false, service_available = false;
 
 	if(xmpp_stanza_get_child_by_name(stanza1, "connectionRequest")) {
 		from = xmpp_stanza_get_attribute(stanza1, "from");
-		request++;
-		current_time = time(NULL);
-        if ((restrict_start_time==0) ||
-            ((current_time-restrict_start_time) > CONNECTION_REQUEST_RESTRICT_PERIOD))
-        {
-            restrict_start_time = current_time;
-            request  = 1;
-        }
-        else
-        {
-            request++;
-            if (request > CONNECTION_REQUEST_RESTRICT_REQUEST)
-            {
-                restrict_start_time = current_time;
-                permitted = false;
-				cwmp_xmpp_log(SINFO,"Permitted CR Request Exceeded");
-				goto xmpp_end;
-            }
-        }
 	}
 	else {
 		cwmp_xmpp_log(SDEBUG,"xmpp connection request handler does not contain an iq type");
@@ -218,20 +196,13 @@ static int cr_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza1, v
 		goto xmpp_end; //send error response
 	}
 xmpp_end:
-	if (!valid_ns)
-	{
+	if (!valid_ns) {
 		cwmp_xmpp_log(SINFO,"XMPP Invalid Name space");
 		send_stanza_cr_error(conn, stanza1, userdata, XMPP_SERVICE_UNAVAILABLE);
 		return 1;
-	}
-	else if (!permitted)
-	{
-		cwmp_xmpp_log(SINFO,"XMPP Invalid Name space");
-		send_stanza_cr_error(conn, stanza1, userdata, XMPP_SERVICE_UNAVAILABLE);
-		return 1;
-	}
-	else if (!service_available) {
+	} else if (!service_available) {
 		cwmp_xmpp_log(SINFO,"XMPP Service Unavailable");
+		send_stanza_cr_error(conn, stanza1, userdata, XMPP_SERVICE_UNAVAILABLE);
 		return 1;
 	} else if (!auth_status) {
 		cwmp_xmpp_log(SINFO,"XMPP Not Authorized");
@@ -246,6 +217,32 @@ xmpp_end:
 	return 1;
 }
 
+int ping_keepalive_handler(xmpp_conn_t * const conn, void * const userdata)
+{
+	xmpp_stanza_t 	*ping_ka, *ping;
+	xmpp_ctx_t		*ctx = (xmpp_ctx_t*)userdata;
+	char *jid;
+
+	cwmp_xmpp_log(SDEBUG, "XMPP PING OF KEEPALIVE ");
+	asprintf(&jid, "%s@%s/%s", cur_xmpp_con.username, cur_xmpp_con.domain, cur_xmpp_con.resource);
+	ping_ka = xmpp_stanza_new(ctx);
+	xmpp_stanza_set_name(ping_ka, "iq");
+	xmpp_stanza_set_type(ping_ka, "get");
+	xmpp_stanza_set_id(ping_ka, "s2c1");
+	xmpp_stanza_set_attribute(ping_ka, "from", jid);
+	xmpp_stanza_set_attribute(ping_ka, "to", cur_xmpp_con.domain);
+
+	ping = xmpp_stanza_new(ctx);
+	xmpp_stanza_set_name(ping, "ping");
+	xmpp_stanza_set_attribute(ping, "xmlns", "urn:xmpp:ping");
+	xmpp_stanza_add_child(ping_ka, ping);
+	xmpp_stanza_release(ping);
+	xmpp_send(conn, ping_ka);
+	xmpp_stanza_release(ping_ka);
+	free(jid);
+	return 1;
+}
+
 void conn_handler(xmpp_conn_t * const conn, const xmpp_conn_event_t status,
 		const int error, xmpp_stream_error_t * const stream_error,
 		void * const userdata)
@@ -258,6 +255,7 @@ void conn_handler(xmpp_conn_t * const conn, const xmpp_conn_event_t status,
 		attempt = 0;
 		cwmp_xmpp_log(SINFO,"XMPP Connection Established");
 		xmpp_handler_add(conn, cr_handler, NULL, "iq", NULL, ctx);
+		xmpp_timed_handler_add(conn, ping_keepalive_handler, cur_xmpp_con.keepalive_interval * 1000, userdata);
 		pres = xmpp_stanza_new(ctx);
 		xmpp_stanza_set_name(pres, "presence");
 		xmpp_send(conn, pres);
diff --git a/xmpp/xmpp.h b/xmpp/xmpp.h
index 0255cc9..ef4bc76 100644
--- a/xmpp/xmpp.h
+++ b/xmpp/xmpp.h
@@ -31,8 +31,6 @@
 #define DEFAULT_RETRY_INTERVAL_MULTIPLIER	2000
 #define DEFAULT_RETRY_MAX_INTERVAL			60
 #define DEFAULT_XMPP_RECONNECTION_RETRY		5
-#define CONNECTION_REQUEST_RESTRICT_PERIOD	5
-#define CONNECTION_REQUEST_RESTRICT_REQUEST	50
 
 enum xmpp_cr_error {
 	XMPP_CR_NO_ERROR = 0,