planix.org/actube
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cw_ktv_set_word and cw_ktv_setdword added

Browse Source 
FossilOrigin-Name: db2628d0a97473f499170b32d2ad13ef2158334ce009ff8d5bd9f9331d653fc4
This commit is contained in:
7u83@mail.ru 2018-04-04 17:23:40 +00:00
parent b21845d3c0
commit aa24582d05
8 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libcw.project
View File

@ -278,6 +278,8 @@
<File Name="src/cw/mavl_get_ext.c"/> <File Name="src/cw/mavl_get_ext.c"/>
<File Name="src/cw/cw_type_bool.c"/> <File Name="src/cw/cw_type_bool.c"/>
<File Name="src/cw/cw_ktv_get_bstr16.c"/> <File Name="src/cw/cw_ktv_get_bstr16.c"/>
<File Name="src/cw/cw_ktv_set_word.c"/>
<File Name="src/cw/cw_ktv_set_dword.c"/>
</VirtualDirectory> </VirtualDirectory>
</VirtualDirectory> </VirtualDirectory>
<Description/> <Description/>

5
src/ac/config.ktv
View File

@ -14,7 +14,8 @@ ac-descriptor/hardware/vendor:Dword:1234567
ac-descriptor/hardware/version:Bstr16:"1.7.3" ac-descriptor/hardware/version:Bstr16:"1.7.3"
ac-name:Bstr16:"TubesAC" ac-name:Bstr16:"TubesAC"
capwap-control-ip-address/address.0:IPAddress:192.168.0.14 #capwap-control-ip-address/address.0:IPAddress:1192.168.0.14
capwap-control-ip-address/address.0:IPAddress:172.16.66.229
#capwap-control-ip-address/address.0:IPAddress:192.168.0.131 #capwap-control-ip-address/address.0:IPAddress:192.168.0.131
#capwap-control-ip-address/address.1:IPAddress:2a00:c1a0:48c6:4a00:9965:1b6e:aca3:1398 #capwap-control-ip-address/address.1:IPAddress:2a00:c1a0:48c6:4a00:9965:1b6e:aca3:1398
capwap-control-ip-address/wtps.0:Word:0 capwap-control-ip-address/wtps.0:Word:0
@ -27,7 +28,7 @@ capwap-control-ip-address/wtps.0:Word:0
capwap/ssl-cipher:Str:+DHE-RSA:+RSA:+AES-256-CBC:+AES-128-CBC:+SHA1:+PSK capwap/ssl-cipher:Str:+DHE-RSA:+RSA:+AES-256-CBC:+AES-128-CBC:+SHA1:+PSK
capwap/ssl-psk-enable:Bool:true capwap/ssl-psk-enable:Bool:true
capwap/ssl-psk:Bstr16:"HalloWelt" capwap/ssl-psk:Bstr16:"HalloWelt"
capwap/ssl-dhbits:Word: 64 capwap/ssl-dhbits:Word: 1024
psk:Bstr16:1234 psk:Bstr16:1234

2
src/ac/wtpman.c
View File

@ -178,7 +178,7 @@ static int wtpman_establish_dtls(void *arg)
cw_dbg(DBG_DTLS, "DTLS session established with %s, %s", cw_dbg(DBG_DTLS, "DTLS session established with %s, %s",
sock_addr2str_p(&wtpman->conn->addr,sock_buf), dtls_get_cipher(wtpman->conn,cipherstr)); sock_addr2str_p(&wtpman->conn->addr,sock_buf), dtls_get_cipher(wtpman->conn,cipherstr));
exit(0);
return 1; return 1;
} }

2
src/cw/Makefile
View File

@ -109,6 +109,8 @@ KTVSRC=\
cw_ktv_get_bool.c\ cw_ktv_get_bool.c\
cw_ktv_get_bstr16.c\ cw_ktv_get_bstr16.c\
cw_ktv_set_byte.c\ cw_ktv_set_byte.c\
cw_ktv_set_word.c\
cw_ktv_set_dword.c\
cw_ktv_get.c\ cw_ktv_get.c\
cw_ktv_get_word.c\ cw_ktv_get_word.c\
cw_ktv_get_dword.c\ cw_ktv_get_dword.c\

4
src/cw/conn_process_packet.c
View File

@ -473,10 +473,10 @@ static int process_elements(struct conn *conn, uint8_t * rawmsg, int len,
if (result_code > 0) { if (result_code > 0) {
/* the end method gave us an result code>0, so /* the end method gave us an result code>0, so
send an error message */ send an error message */
printf("Here we are, error response %i %s\n", result_code, cw_strerror(result_code));
exit(0);
cw_send_error_response(conn, rawmsg, result_code); cw_send_error_response(conn, rawmsg, result_code);
} else if (result_code == 0) { } else if (result_code == 0) {
/*cw_ktv_add_word(conn->local_cfg,"result_code")*/
/* All is ok, send regular response message */ /* All is ok, send regular response message */
cw_send_response(conn, rawmsg, len); cw_send_response(conn, rawmsg, len);

6
src/cw/cw_ktv_set_dword.c Normal file
View File

@ -0,0 +1,6 @@
#include "ktv.h"
cw_KTV_t * cw_ktv_set_dword(mavl_t ktv,const char * key, uint32_t dword)
{
return cw_ktv_replace(ktv,key,CW_TYPE_DWORD,(void*)&dword,4);
}

6
src/cw/cw_ktv_set_word.c Normal file
View File

@ -0,0 +1,6 @@
#include "ktv.h"
cw_KTV_t * cw_ktv_set_word(mavl_t ktv,const char * key, uint16_t word)
{
return cw_ktv_replace(ktv,key,CW_TYPE_WORD,(void*)&word,2);
}

3
src/cw/ktv.h
View File

@ -144,6 +144,9 @@ cw_KTV_t * cw_ktv_get(mavl_t ktv, const char *key, const cw_Type_t * type);
uint8_t cw_ktv_get_byte(mavl_t ktv,const char *key, uint8_t def); uint8_t cw_ktv_get_byte(mavl_t ktv,const char *key, uint8_t def);
uint8_t cw_ktv_get_bool(mavl_t ktv,const char *key, uint8_t def); uint8_t cw_ktv_get_bool(mavl_t ktv,const char *key, uint8_t def);
cw_KTV_t * cw_ktv_set_byte(mavl_t ktv,const char * key, uint8_t byte); cw_KTV_t * cw_ktv_set_byte(mavl_t ktv,const char * key, uint8_t byte);
cw_KTV_t * cw_ktv_set_dword(mavl_t ktv,const char * key, uint32_t dword);
cw_KTV_t * cw_ktv_set_word(mavl_t ktv,const char * key, uint16_t word);
bstr16_t cw_ktv_get_bstr16(mavl_t ktv,const char *key, bstr16_t def); bstr16_t cw_ktv_get_bstr16(mavl_t ktv,const char *key, bstr16_t def);
uint16_t cw_ktv_get_word(mavl_t ktv,const char *key, uint16_t def); uint16_t cw_ktv_get_word(mavl_t ktv,const char *key, uint16_t def);