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

resolve conflicts with master

Browse source
This commit is contained in:
Anis Ellouze 2016-05-31 12:10:56 +01:00
parent b659df7356
commit b79c242ddd
8 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -50,7 +50,6 @@ AC_SUBST([LIBZ_LIBS])
LIBM_LIBS='-lm'
AC_SUBST([LIBM_LIBS])
LIBJSON_LIBS='-ljson-c'
AC_SUBST([LIBJSON_LIBS])

2
dm/dmcwmp.c
View file

@ -371,7 +371,7 @@ void add_list_enabled_notify(char *param, char *notification, char *value)
dm_enabled_notify = calloc(1, sizeof(struct param_fault)); // Should be calloc and not dmcalloc
list_add_tail(&dm_enabled_notify->list, &list_enabled_notify);
dm_enabled_notify->name = strdup(param); // Should be strdup and not dmstrdup
dm_enabled_notify->value = value ? strdup(value) : strdup("");
dm_enabled_notify->value = value ? strdup(value) : strdup(""); // Should be strdup and not dmstrdup
dm_enabled_notify->notification = strdup(notification); // Should be strdup and not dmstrdup
}

4
dm/dmtree/tr098/landevice.c
View file

@ -721,7 +721,7 @@ int get_lan_dhcp_leasetime(char *refparam, struct dmctx *ctx, char **value)
}
} else {
pch = strtok_r(ltime, "s", &spch);
if (strcmp(pch, ltime_ini) != 0)
if (strcmp(pch, ltime_ini) != 0)
mtime += atoi(pch);
}
}
@ -729,7 +729,7 @@ int get_lan_dhcp_leasetime(char *refparam, struct dmctx *ctx, char **value)
else {
pch = strtok_r(ltime, "m", &spch);
if (strcmp(pch, ltime_ini) != 0) {
mtime += 60 * atoi(pch);
mtime += 60 * atoi(pch);
if(spch[0] !='\0') {
ltime += strlen(pch)+1;
ltime_ini += strlen(pch)+1;

1
dm/dmtree/tr098/landevice.h
View file

@ -13,6 +13,7 @@
#define __LAN_DEVICE_H
#include <libubox/blobmsg_json.h>
#include <json-c/json.h>
#define NVRAM_FILE "/proc/nvram/WpaKey"
struct wl_clientargs
{

3
dm/dmtree/tr098/wandevice.h
View file

@ -14,6 +14,7 @@
#include <libubox/blobmsg_json.h>
#include <json-c/json.h>
struct wancprotoargs
{
struct uci_section *wancprotosection;
@ -36,4 +37,4 @@ struct wanargs
char *fdev;
};
int entry_method_root_WANDevice(struct dmctx *ctx);
#endif
#endif

2
event.c
View file

@ -410,8 +410,8 @@ int event_remove_noretry_event_container(struct session *session)
{
struct event_container *event_container;
struct dm_parameter *dm_parameter;
struct list_head *ilist, *q;
struct list_head *ilist, *q;
list_for_each_safe(ilist,q,&(session->head_event_container))
{
event_container = list_entry(ilist, struct event_container, list);

22
http.c
View file

@ -235,18 +235,18 @@ http_send_message(struct cwmp *cwmp, char *msg_out, int msg_out_len,char **msg_i
if (!strlen(*msg_in))
FREE(*msg_in);
curl_easy_getinfo(curl, CURLINFO_PRIMARY_IP, &ip);
if (ip && ip[0] != '\0') {
if (!ip_acs || strcmp(ip_acs, ip) != 0) {
FREE(ip_acs);
ip_acs = strdup(ip);
external_init();
external_simple("allow_cr_ip", ip_acs);
external_exit();
}
}
curl_easy_getinfo(curl, CURLINFO_PRIMARY_IP, &ip);
if (ip && ip[0] != '\0') {
if (!ip_acs || strcmp(ip_acs, ip) != 0) {
FREE(ip_acs);
ip_acs = strdup(ip);
external_init();
external_simple("allow_cr_ip", ip_acs);
external_exit();
}
}
curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
if(http_code == 204)
{
CWMP_LOG (INFO,"Receive HTTP 204 No Content");

4
jshn.c
View file

@ -13,11 +13,7 @@
#include <unistd.h>
#include <libubus.h>
#ifdef _AADJ
#include <json-c/json.h>
#else
#include <json-c/json.h>
#endif
#include "cwmp.h"
#include "external.h"