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

xmpp: enhancement when checking the tls

Browse source
This commit is contained in:
Amin Ben Ramdhane 2019-06-20 15:26:00 +01:00 • committed by Sukru Senli
parent 82288cd8cd
commit 1211dd5ea3
6 changed files with 34 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config/cwmp_xmpp
View file

@ -13,6 +13,7 @@ config xmpp_connection
option password ''
option domain ''
option resource ''
option usetls '0'
option interval '30'
option attempt '16'
option initial_retry_interval ''

9
dm/dmtree/common/xmpp.c
View file

@ -170,7 +170,8 @@ int set_connection_enable(char *refparam, struct dmctx *ctx, void *data, char *i
return FAULT_9007;
return 0;
case VALUESET:
dmuci_set_value_by_section(connsection, "enable", value);
string_to_bool(value, &b);
dmuci_set_value_by_section(connsection, "enable", b ? "1" : "0");
return 0;
}
return 0;
@ -447,7 +448,8 @@ int set_xmpp_connection_server_usetls(char *refparam, struct dmctx *ctx, void *d
return FAULT_9007;
return 0;
case VALUESET:
dmuci_set_value_by_section(connsection, "usetls", value);
string_to_bool(value, &b);
dmuci_set_value_by_section(connsection, "usetls", b ? "1" : "0");
return 0;
}
return 0;
@ -506,7 +508,8 @@ int set_xmpp_connection_server_enable(char *refparam, struct dmctx *ctx, void *d
return FAULT_9007;
return 0;
case VALUESET:
dmuci_set_value_by_section(connsection, "enable", value);
string_to_bool(value, &b);
dmuci_set_value_by_section(connsection, "enable", b ? "1" : "0");
return 0;
}
return 0;

13
xmpp/xmpp.c
View file

@ -320,10 +320,13 @@ void xmpp_connecting(void)
log_cwmp_xmpp.userdata = &(xmpp_mesode_log_level);
ctx = xmpp_ctx_new(NULL, &log_cwmp_xmpp);
conn = xmpp_conn_new(ctx);
/* Set flag XMPP_CONN_FLAG_TRUST_TLS to
ignore result of the verification */
/*flags |= XMPP_CONN_FLAG_TRUST_TLS;*/
/*xmpp_conn_set_flags(conn, flags);*/
if(cur_xmpp_con.usetls)
flags |= XMPP_CONN_FLAG_MANDATORY_TLS; /* Set flag XMPP_CONN_FLAG_MANDATORY_TLS to oblige the verification of tls */
else
flags |= XMPP_CONN_FLAG_TRUST_TLS; /* Set flag XMPP_CONN_FLAG_TRUST_TLS to ignore result of the verification */
xmpp_conn_set_flags(conn, flags);
asprintf(&jid, "%s@%s/%s", cur_xmpp_con.username, cur_xmpp_con.domain, cur_xmpp_con.resource);
xmpp_conn_set_jid(conn, jid);
xmpp_conn_set_pass(conn, cur_xmpp_con.password);
@ -453,6 +456,7 @@ int xmpp_con_init(void)
cur_xmpp_con.password = strdup((const char *)get_xmpp_password(instance));
cur_xmpp_con.domain = strdup((const char *)get_xmpp_domain(instance));
cur_xmpp_con.resource = strdup((const char *)get_xmpp_resource(instance));
cur_xmpp_con.usetls = atoi((const char *)get_xmpp_usetls(instance));
cur_xmpp_con.serveralgorithm = strdup((const char *)get_xmpp_serveralgorithm(instance));
cur_xmpp_con.serveraddress = strdup((const char *)get_xmpp_server_address(instance));
cur_xmpp_con.port = atoi((const char *)get_xmpp_port(instance));
@ -472,6 +476,7 @@ int xmpp_con_init(void)
cwmp_xmpp_log(SDEBUG,"XMPP password: %s", cur_xmpp_con.password);
cwmp_xmpp_log(SDEBUG,"XMPP domain: %s", cur_xmpp_con.domain);
cwmp_xmpp_log(SDEBUG,"XMPP resource: %s", cur_xmpp_con.resource);
cwmp_xmpp_log(SDEBUG,"XMPP use_tls: %d", cur_xmpp_con.usetls);
cwmp_xmpp_log(SDEBUG,"XMPP serveralgorithm: %s", cur_xmpp_con.serveralgorithm);
cwmp_xmpp_log(SDEBUG,"XMPP server_address: %s", cur_xmpp_con.serveraddress);
cwmp_xmpp_log(SDEBUG,"XMPP port: %d", cur_xmpp_con.port);

2
xmpp/xmpp.h
View file

@ -31,7 +31,6 @@
#define DEFAULT_RETRY_INTERVAL_MULTIPLIER 2000
#define DEFAULT_RETRY_MAX_INTERVAL 60
#define DEFAULT_XMPP_RECONNECTION_RETRY 5
#define XMPP_CONN_FLAG_TRUST_TLS (1UL << 3)
enum xmpp_cr_error {
XMPP_CR_NO_ERROR = 0,
@ -61,6 +60,7 @@ struct xmpp_connection
int retry_interval_multiplier;
int retry_max_interval;
int port;
bool usetls;
};
extern struct xmpp_config cur_xmpp_conf;

16
xmpp/xmppconfig.c
View file

@ -121,6 +121,22 @@ char *get_xmpp_resource(char *instance)
return v;
}
char *get_xmpp_usetls(char *instance)
{
struct uci_section *s;
char *v, *conn_inst;
dmuci_foreach_section("cwmp_xmpp", "xmpp_connection", s) {
conn_inst = dmuci_get_value_bysection(s, "connection_instance");
if(strcmp(conn_inst, instance) == 0)
{
v = dmuci_get_value_bysection(s, "usetls");
return v;
}
}
v = "";
return v;
}
char *get_xmpp_keepalive_interval(char *instance)
{
struct uci_section *s;

1
xmpp/xmppconfig.h
View file

@ -32,6 +32,7 @@ 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_usetls(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);