mirror/icwmp
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/icwmp.git synced 2026-03-03 07:54:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ticket refs #14599: SDX810-AP: Unable to manage SDX810-AP from ACS server when it is connected via NAT Gateway(SDX-810RG)(complement-4)

Browse source
This commit is contained in:
Amin Ben Ramdhane 2018-08-07 15:39:24 +01:00
parent 631b223860
commit 74b210ee08
4 changed files with 72 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dm/dmtree/common/managementserver.c
View file

@ -44,9 +44,11 @@ DMLEAF tManagementServerParams[] = {
{"CWMPRetryIntervalMultiplier", &DMWRITE, DMT_UNINT, get_management_server_retry_interval_multiplier, set_management_server_retry_interval_multiplier, NULL, NULL},
{"AliasBasedAddressing", &DMREAD, DMT_BOOL, get_alias_based_addressing, NULL, &DMFINFRM, NULL},
{"InstanceMode", &DMWRITE, DMT_STRING, get_instance_mode, set_instance_mode, NULL, NULL},
#ifdef XMPP_ENABLE
{"ConnReqAllowedJabberIDs", &DMWRITE, DMT_STRING, get_management_server_conn_rep_allowed_jabber_id, set_management_server_conn_rep_allowed_jabber_id, NULL, NULL},
{"ConnReqJabberID", &DMREAD, DMT_STRING, get_management_server_conn_req_jabber_id, NULL, NULL, NULL},
{"ConnReqXMPPConnection", &DMWRITE, DMT_STRING, get_management_server_conn_req_xmpp_connection, set_management_server_conn_req_xmpp_connection, NULL, NULL},
{"ConnReqJabberID", &DMREAD, DMT_STRING, get_management_server_conn_req_jabber_id, NULL, &DMFINFRM, &DMACTIVE},
{"ConnReqXMPPConnection", &DMWRITE, DMT_STRING, get_management_server_conn_req_xmpp_connection, set_management_server_conn_req_xmpp_connection, &DMFINFRM, NULL},
#endif
{"SupportedConnReqMethods", &DMREAD, DMT_STRING, get_management_server_supported_conn_req_methods, NULL, NULL, NULL},
{"UDPConnectionRequestAddress", &DMREAD, DMT_STRING, get_upd_cr_address, NULL, NULL, NULL},
{"STUNEnable", &DMWRITE, DMT_BOOL, get_stun_enable, set_stun_enable, NULL, NULL},
@ -687,6 +689,7 @@ int set_management_server_conn_req_xmpp_connection(char *refparam, struct dmctx
break;
}
}
cwmp_set_end_session(END_SESSION_RELOAD);
return 0;
}
return 0;

33
init/icwmp_xmppd
View file

@ -12,26 +12,19 @@ PROG="/usr/sbin/icwmp_xmppd"
start_service() {
local enable_xmpp=`uci -q get cwmp_xmpp.xmpp.enable`
local id=`uci -q get cwmp_xmpp.xmpp.id`
local i=0
local inst=`uci get cwmp_xmpp.@xmpp_connection[$i].connection_instance`
while [ "$inst" != "" ]; do
if [ "$inst" = "$id" ]; then
local serveralgorithm=`uci get cwmp_xmpp.@xmpp_connection[$i].serveralgorithm`
local enable_conn=`uci -q get cwmp_xmpp.@xmpp_connection[$i].enable`
local enable_srv=`uci -q get cwmp_xmpp.@xmpp_connection_server[$i].enable`
if [ "$enable_xmpp" = "1" ]; then
if [ "$serveralgorithm" = "DNS-SRV" ] && [ "$enable_conn" = "1" ] || [ "$serveralgorithm" = "ServerTable" ] && [ "$enable_conn" = "1" ] && [ "$enable_srv" = "1" ]; then
procd_open_instance
procd_set_param command "$PROG"
procd_set_param respawn "3" "7" "0"
procd_close_instance
fi
fi
break
fi
i=$((i+1))
local inst=`uci get cwmp_xmpp.@xmpp_connection[$i].connection_instance`
done
local xmpp_connection=`uci show cwmp_xmpp | grep "cwmp_xmpp.@xmpp_connection.*connection_instance=\'$id\'" | cut -d "." -f 2`
local xmpp_connection_server=`uci show cwmp_xmpp | grep "cwmp_xmpp.@xmpp_connection.*id_connection=\'$id\'" | cut -d "." -f 2`
local serveralgorithm=`uci get cwmp_xmpp.$xmpp_connection.serveralgorithm`
local enable_conn=`uci -q get cwmp_xmpp.$xmpp_connection.enable`
local enable_srv=`uci -q get cwmp_xmpp.$xmpp_connection_server.enable`
if [ "$enable_xmpp" = "1" ]; then
if ([ "$serveralgorithm" = "DNS-SRV" ] && [ "$enable_conn" = "1" ]) || ([ "$serveralgorithm" = "ServerTable" ] && [ "$enable_conn" = "1" ] && [ "$enable_srv" = "1" ]); then
procd_open_instance
procd_set_param command "$PROG"
procd_set_param respawn "3" "7" "0"
procd_close_instance
fi
fi
}
boot() {

5
ubus.c
View file

@ -278,6 +278,11 @@ cwmp_handle_inform(struct ubus_context *ctx, struct ubus_object *obj,
}
else {
int event_code = cwmp_get_int_event_code(event);
if (event_code == 6)
{
CWMP_LOG(INFO,"Receive Connection Request: success authentication");
CWMP_LOG(INFO,"Connection Request thread: add connection request event in the queue");
}
pthread_mutex_lock (&(cwmp_main.mutex_session_queue));
cwmp_add_event_container (&cwmp_main, event_code, "");
pthread_mutex_unlock (&(cwmp_main.mutex_session_queue));

72
xmpp/xmpp.c
View file

@ -114,16 +114,20 @@ static int send_stanza_cr_error(xmpp_conn_t * const conn, xmpp_stanza_t * const
int check_xmpp_authorized(char *from)
{
char *pch, *spch, *str;
int len;
if (cur_xmpp_conf.xmpp_allowed_jid == NULL || cur_xmpp_conf.xmpp_allowed_jid[0] == '\0')
{
xmpp_log(SDEBUG,"xmpp connection request handler : allowed jid is empty");
return 1;
}
else
{
str = strdup(cur_xmpp_conf.xmpp_allowed_jid);
pch = strtok_r(str, ",", &spch);
int len = strlen(pch);
len = strlen(pch);
while (pch != NULL) {
if(strncmp(pch, from, len) == 0 && (from[len] == '\0' || from[len] == '/') ){
if(strncmp(pch, from, len) == 0){
free(str);
return 1;
}
@ -140,12 +144,11 @@ static int cr_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza1, v
static int request = 0;
static time_t restrict_start_time = 0;
xmpp_ctx_t *ctx = (xmpp_ctx_t*)userdata;
char *intext = NULL, *name_space, *text, *from, *username, *password;
char *name_space, *text, *from, *username, *password;
xmpp_stanza_t *child, *mech;
bool valid_ns = true, auth_status = false, service_available = false, permitted = true;
if(xmpp_stanza_get_child_by_name(stanza1, "connectionRequest")) {
intext = xmpp_stanza_get_text(xmpp_stanza_get_child_by_name(stanza1, "connectionRequest"));
from = xmpp_stanza_get_attribute(stanza1, "from");
request++;
current_time = time(NULL);
@ -168,13 +171,16 @@ static int cr_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza1, v
}
}
else {
xmpp_log(SDEBUG,"xmpp connection request handler does not contain an iq type");
return 1;
}
if (!check_xmpp_authorized(from))
{
service_available = false;
xmpp_log(SDEBUG,"xmpp connection request handler not authorized by allowed jid");
goto xmpp_end;
}
child = xmpp_stanza_get_child_by_name(stanza1, "connectionRequest");
if(child) {
service_available = true;
@ -347,7 +353,7 @@ void xmpp_connecting(void)
else
{
attempt = 0;
xmpp_log(SINFO,"XMPP Handle Connection");
xmpp_log(SDEBUG,"XMPP Handle Connection");
xmpp_run(ctx);
}
}
@ -368,19 +374,32 @@ void xmpp_global_conf(void)
value = dmuci_get_value("cwmp", "cpe", "amd_version");
if( atoi(value) >= 5)
{
value = dmuci_get_value("cwmp_xmpp", "xmpp", "loglevel");
if(value != NULL && *value != '\0')
{
b = atoi(value);
free(value);
value = NULL;
cur_xmpp_conf.xmpp_loglevel = b;
}
else
cur_xmpp_conf.xmpp_loglevel = DEFAULT_LOGLEVEL;
xmpp_log(SDEBUG,"Log Level of XMPP connection is :%d", cur_xmpp_conf.xmpp_loglevel);
value = dmuci_get_value("cwmp_xmpp", "xmpp", "enable");
if(value != NULL)
if(value != NULL && *value != '\0')
{
if ((strcasecmp(value,"true")==0) || (strcmp(value,"1")==0))
{
cur_xmpp_conf.xmpp_enable = true;
xmpp_log(SINFO,"XMPP connection is Enabled (%d)", cur_xmpp_conf.xmpp_enable);
xmpp_log(SDEBUG,"XMPP connection is Enabled :%d", cur_xmpp_conf.xmpp_enable);
}
free(value);
value = NULL;
}
value = dmuci_get_value("cwmp_xmpp", "xmpp", "id");
if(value != NULL)
if(value != NULL && *value != '\0')
{
a = atoi(value);
free(value);
@ -388,39 +407,31 @@ void xmpp_global_conf(void)
}
if(a==0)
{
xmpp_log(SINFO,"XMPP connection id :Empty");
xmpp_log(SDEBUG,"XMPP connection id :Empty");
cur_xmpp_conf.xmpp_connection_id = 0;
}
else
{
xmpp_log(SINFO,"XMPP connection id :%d", a);
xmpp_log(SDEBUG,"XMPP connection id :%d", a);
cur_xmpp_conf.xmpp_connection_id = a;
}
value = dmuci_get_value("cwmp_xmpp", "xmpp", "allowed_jid");
if(value != NULL)
if(value != NULL && *value != '\0')
{
if (cur_xmpp_conf.xmpp_allowed_jid != NULL)
{
free(cur_xmpp_conf.xmpp_allowed_jid);
}
cur_xmpp_conf.xmpp_allowed_jid = value;
value = NULL;
}
value = dmuci_get_value("cwmp_xmpp", "xmpp", "loglevel");
if(value != NULL)
{
b = atoi(value);
cur_xmpp_conf.xmpp_allowed_jid = strdup(value);
xmpp_log(SDEBUG,"XMPP connection allowed jaber id :%s", cur_xmpp_conf.xmpp_allowed_jid);
free(value);
value = NULL;
xmpp_log(SINFO,"Log Level of XMPP connection is :%d", b);
cur_xmpp_conf.xmpp_loglevel = b;
}
else
{
xmpp_log(SINFO,"Log Level of XMPP connection is :%d", DEFAULT_LOGLEVEL);
cur_xmpp_conf.xmpp_loglevel = DEFAULT_LOGLEVEL;
cur_xmpp_conf.xmpp_allowed_jid = strdup("");
xmpp_log(SDEBUG,"XMPP connection allowed jaber id is empty");
}
}
}
@ -435,6 +446,8 @@ int xmpp_con_init(void)
asprintf(&connectionserver, "%s", get_xmppconnection_server_enable(instance));
connection_enable = strdup(connection);
connectionserver_enable = strdup(connectionserver);
free(connection);
free(connectionserver);
cur_xmpp_con.serveralgorithm = strdup((const char *)get_xmpp_serveralgorithm(instance));
if( strcmp(cur_xmpp_con.serveralgorithm,"DNS-SRV") == 0)
{
@ -469,6 +482,19 @@ int xmpp_con_init(void)
cur_xmpp_con.retry_max_interval = atoi((const char *)get_xmpp_connect_retry_max_interval(instance));
cur_xmpp_con.retry_max_interval = (cur_xmpp_con.retry_max_interval) ? cur_xmpp_con.retry_max_interval : DEFAULT_RETRY_MAX_INTERVAL;
}
xmpp_log(SDEBUG,"XMPP username: %s", cur_xmpp_con.username);
xmpp_log(SDEBUG,"XMPP password: %s", cur_xmpp_con.password);
xmpp_log(SDEBUG,"XMPP domain: %s", cur_xmpp_con.domain);
xmpp_log(SDEBUG,"XMPP resource: %s", cur_xmpp_con.resource);
xmpp_log(SDEBUG,"XMPP serveralgorithm: %s", cur_xmpp_con.serveralgorithm);
xmpp_log(SDEBUG,"XMPP server_address: %s", cur_xmpp_con.serveraddress);
xmpp_log(SDEBUG,"XMPP port: %d", cur_xmpp_con.port);
xmpp_log(SDEBUG,"XMPP keepalive_interval: %d", cur_xmpp_con.keepalive_interval);
xmpp_log(SDEBUG,"XMPP connect_attempt: %d", cur_xmpp_con.connect_attempt);
xmpp_log(SDEBUG,"XMPP retry_initial_interval: %d", cur_xmpp_con.retry_initial_interval);
xmpp_log(SDEBUG,"XMPP retry_interval_multiplier: %d", cur_xmpp_con.retry_interval_multiplier);
xmpp_log(SDEBUG,"XMPP retry_max_interval: %d", cur_xmpp_con.retry_max_interval);
end:
dmuci_fini();
return 0;