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

optimize acs dhcp discovery

Browse source
This commit is contained in:
zribiahmed 2013-02-12 15:09:45 +00:00
parent a893195479
commit 984fe676f9
4 changed files with 75 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/config.c
View file

@ -400,9 +400,26 @@ int get_global_config(struct config *conf)
}
}
if((error = uci_get_value(UCI_DHCP_ACS_URL_PATH,&value)) == CWMP_OK)
{
if(value != NULL)
{
if (conf->dhcp_url_path!=NULL)
{
free(conf->dhcp_url_path);
}
conf->dhcp_url_path = value;
value = NULL;
}
}
else
{
return error;
}
error = uci_get_value(UCI_DHCP_DISCOVERY_PATH,&value);
error2 = uci_get_state_value(UCI_ACS_URL_PATH,&value2);
error3 = uci_get_state_value(UCI_DHCP_ACS_URL_PATH,&value3);
error3 = uci_get_state_value(conf->dhcp_url_path,&value3);
if ((((error == CWMP_OK) && (value != NULL) && (strcmp(value,"enable") == 0)) ||
((error2 == CWMP_OK) && ((value2 == NULL) || (value2[0] == 0)))) &&

1
src/config/cwmp
View file

@ -6,6 +6,7 @@ config 'cwmp' 'acs'
option 'periodic_inform_interval' '1800'
option 'ParameterKey' ''
option 'dhcp_discovery' 'disable'
option 'dhcp_url_path' 'provisioning.iup.tr069url'
config 'cwmp' 'cpe'
option 'interface' 'br-lan'

3
src/inc/cwmp.h
View file

@ -32,7 +32,7 @@
#define DEFAULT_ACSURL "http://192.168.1.1:8080/openacs/acs"
#define UCI_DHCP_DISCOVERY_PATH "cwmp.acs.dhcp_discovery"
#define UCI_DHCP_ACS_URL_PATH "provisioning.iup.tr069url"
#define UCI_DHCP_ACS_URL_PATH "cwmp.acs.dhcp_url_path"
#define UCI_ACS_URL_PATH "cwmp.acs.url"
#define UCI_PERIODIC_INFORM_INTERVAL_PATH "cwmp.acs.periodic_inform_interval"
#define UCI_PERIODIC_INFORM_ENABLE_PATH "cwmp.acs.periodic_inform_enable"
@ -129,6 +129,7 @@ typedef struct config {
char *acs_passwd;
char *cpe_userid;
char *cpe_passwd;
char *dhcp_url_path;
char *ip;
char *interface;
char *ubus_socket;

106
src/init/cwmpd.init
View file

@ -4,14 +4,15 @@
START=99
STOP=40
EXTRA_HELP=" start [GetRPCMethods] Start cwmpd service and send GetRPCMethods"
EXTRA_HELP=" start [GetRPCMethods] Start cwmpd service and send GetRPCMethods"
wait_connection_acs() {
default_acs="http://192.168.1.1:8080/openacs/acs"
acs_dhcp_discovery=`uci -q get cwmp.acs.dhcp_discovery`
url=`uci -q get cwmp.acs.url`
dhcp_url_path=`uci -q get cwmp.acs.dhcp_url_path`
if [ \( "_$acs_dhcp_discovery" = "_enable" \) -o \( "_$url" = "_" \) ];then
url=`uci -P /var/state -q get provisioning.iup.tr069url`
url=`uci -P /var/state -q get $dhcp_url_path`
elif [ "_$url" != "_" ];then
url=`uci -q get cwmp.acs.url`
else
@ -27,36 +28,37 @@ wait_connection_acs() {
i=0
result=1
until [ \( $result -eq 0 \) -o \( $i -eq 20 \) ];do
echo -e -n "" | nc $dest $port
result=$?
if [ $result -eq 1 ];then
i=`expr $i + 1`
sleep 5
fi
echo "binding acs url"
until [ \( $result -eq 0 \) -o \( $i -eq 100 \) ];do
echo -e -n "" | nc $dest $port 2> /dev/null
result=$?
if [ $result -eq 1 ];then
i=`expr $i + 1`;echo -n $i;printf "\033[A" ;sleep 1
fi
done
}
check_dhcp() {
i=0
dhcp_discovery=`uci -q get cwmp.acs.dhcp_discovery`
i=0
dhcp_discovery=`uci -q get cwmp.acs.dhcp_discovery`
url=`uci -q get cwmp.acs.url`
if [ \( "_$acs_dhcp_discovery" = "_enable" \) -o \( "_$url" = "_" \) ]
then
while [ $i -le 10 ]
do
acs_url=`uci -P /var/state -q get provisioning.iup.tr069url`
if [ "$acs_url" != "" ]
then
echo "The acs url discovery from dhcp server is successfully done."
break
else
echo "Waiting for discovery of acs url from dhcp server ..."
sleep 10
fi
i=`expr $i + 1`
done
fi
dhcp_url_path=`uci -q get cwmp.acs.dhcp_url_path`
if [ \( "_$acs_dhcp_discovery" = "_enable" \) -o \( "_$url" = "_" \) ]
then
while [ $i -le 10 ]
do
acs_url=`uci -P /var/state -q get $dhcp_url_path`
if [ "$acs_url" != "" ]
then
echo "The acs url discovery from dhcp server is successfully done."
break
else
echo "Waiting for discovery of acs url from dhcp server ..."
sleep 10
fi
i=`expr $i + 1`
done
fi
}
start_msg="Start cwmpd ..."
@ -76,39 +78,39 @@ run() {
}
boot() {
run=$(ps aux|grep /usr/sbin/cwmpd|grep -v grep|grep -v rc.common)
if [ "$run" = "" ];then
run "boot"
else
echo "cwmpd is currently running ..."
fi
run=$(ps aux|grep /usr/sbin/cwmpd|grep -v grep|grep -v rc.common)
if [ "$run" = "" ];then
run "boot"
else
echo "cwmpd is currently running ..."
fi
}
start() {
run=$(ps aux|grep /usr/sbin/cwmpd|grep -v grep|grep -v rc.common)
if [ "$run" = "" ]
then
if [ "$1" = "GetRPCMethods" ];then
run=$(ps aux|grep /usr/sbin/cwmpd|grep -v grep|grep -v rc.common)
if [ "$run" = "" ]
then
if [ "$1" = "GetRPCMethods" ];then
run "GetRPCMethods"
else
run
fi
else
echo "cwmpd is currently running ..."
fi
else
run
fi
else
echo "cwmpd is currently running ..."
fi
}
stop() {
echo $stop_msg;printf "\033[A" ;sleep 1
for pid in `ps aux|grep /usr/sbin/cwmpd|sed 's/^ \+//g'|sed 's/ \+/:/g'|grep -v grep|cut -f1 -d:`
do
if [ "_$pid" != "_" ];then
/bin/kill -9 $pid 2> /dev/null
fi
done
echo $stop_msg;printf "\033[A" ;sleep 1
for pid in `ps aux|grep /usr/sbin/cwmpd|sed 's/^ \+//g'|sed 's/ \+/:/g'|grep -v grep|cut -f1 -d:`
do
if [ "_$pid" != "_" ];then
/bin/kill -9 $pid 2> /dev/null
fi
done
}
restart() {
stop
start
stop
start
}