Compare commits

...

188 Commits

Author SHA1 Message Date
7u83 34ee5537a4 Added some instructions to run AC 2022-08-30 11:20:06 +02:00
7u83 34f5589a17 WTP bind addr and discovery addr ist configurable 2022-08-26 19:50:59 +02:00
7u83 e3ccf2a93c Fixed memroy leak 2022-08-26 19:33:57 +02:00
7u83 276a282369 Moved a lot cfg entries from / to /capwap etc 2022-08-26 17:38:28 +02:00
7u83 d127263d80 ac compiles w/o warnings 2022-08-26 08:05:41 +02:00
7u83 c3b921292b Do some mgic to send Cisco's AC radio info element 2022-08-26 06:46:18 +02:00
7u83 744e1b55c2 cfg_list in conn 2022-08-25 21:02:02 +02:00
7u83 2098cabad1 more capwap80211 moving 2022-08-25 21:10:48 +02:00
7u83 49905b2aa0 Fix in Antenna Payload, some moving to capwap80211 2022-08-25 20:59:12 +02:00
7u83 e571a27c75 Better formatting in list command 2022-08-25 11:22:32 +02:00
7u83 a59a25baa5 Changed queue size to 100 2022-08-25 11:22:13 +02:00
7u83 57890907ae Som kind of shell - act 2022-08-24 16:24:57 +02:00
7u83 86956ff1ce Fixes for Ubuntu 2022-08-24 00:54:54 +02:00
7u83 50d11c0c62 Some kind of shell is now there in act 2022-08-24 00:29:26 +02:00
7u83 2316a1125f Work on shell 2022-08-23 19:55:36 +02:00
7u83 3ee1d725a5 exit command works 2022-08-23 04:08:37 +02:00
7u83 d94239679d Work on ansi shell 2022-08-23 02:35:54 +02:00
7u83 23360febfa Improved CAPWAP AC Descriptr handling 2022-08-22 20:11:33 +02:00
7u83 05963edc98 Work on icapwap_out_ac_status 2022-08-22 20:09:02 +02:00
7u83 815c627e14 Updated 2022-08-22 19:00:50 +02:00
7u83 06822df49a Added /usr/local/lib to get linked under FreeBSD 2022-08-22 18:49:45 +02:00
7u83 19e38b332f Removed ol stuff 2022-08-22 16:44:34 +02:00
7u83 65153617b7 A lot of bug fixes and improvments 2022-08-22 01:59:23 +02:00
7u83 226c4b832a Compiles w/o warning 2022-08-21 20:41:39 +02:00
7u83 196f56b988 More improved dumps 2022-08-21 00:53:41 +02:00
7u83 aa3d83d8a4 cw_Cfg_t is now a structure instead of typedef's mavl 2022-08-20 22:03:06 +02:00
7u83 ee16f3794f Improved debugging 2022-08-20 21:00:46 +02:00
7u83 6405a937d2 CAPWAP Image identifier included and lwapp 55 2022-08-20 14:34:08 +02:00
7u83 c7a934c64b Added some defaults 2022-08-20 02:17:18 +02:00
7u83 e26f9dbfd8 Settings of 1142 after clear capwap private-config 2022-08-20 01:59:54 +02:00
7u83 c422200a9a Alle join and status req messages elems are catched 2022-08-20 01:59:27 +02:00
7u83 301298dcdc updated 2022-08-19 23:55:30 +02:00
7u83 d4c80b5ebb Some reverse engenering of elemen 15 2022-08-19 23:51:46 +02:00
7u83 6dc8d80102 Almost all ktv stuff deleted 2022-08-19 22:23:55 +02:00
7u83 14354039e1 updated install instruction 2022-08-18 18:50:40 +02:00
7u83 e6a064c328 Options for libmavl and include directory added 2022-08-18 10:54:14 +02:00
7u83 6c7ce7727a Example for Localdefs.mak 2022-08-18 08:54:00 +02:00
7u83 44bb37cbb8 Example ckv for cisco 2022-08-18 08:52:44 +02:00
7u83 5dcfaba7ee Added missing message.c 2022-08-18 08:50:34 +02:00
7u83 b574aac31f missing val.c added 2022-08-18 08:49:55 +02:00
7u83 b54f4fb9fa updatedd libmavl to 1.2.0 2022-08-18 08:45:10 +02:00
7u83 7420a5d2fc WTP can join and goes into REG status on WLC 2022-08-18 08:17:31 +02:00
7u83 c2cb96e5dc WTP can join and send cfg request 2022-08-17 18:41:17 +02:00
7u83 9307b05b46 Deleted 2022-08-15 22:08:48 +02:00
7u83 be210692c6 Moved message encoding/decoding to message.c 2022-08-15 21:14:01 +02:00
7u83 a051ba41de WTP can join w/o any memory leaks 2022-08-15 16:31:26 +02:00
7u83 df5e2bcbb7 WTP can run discoveryw/o memory leaks 2022-08-15 00:51:38 +02:00
7u83 daa808f9a2 Fixed some memory leaks 2022-08-14 16:03:31 +02:00
7u83 5f16ed5455 moved conn_destroy to conn.c 2022-08-14 14:15:18 +02:00
7u83 85f79eac6a Eliminated types_tree from msgset 2022-08-14 14:04:58 +02:00
7u83 e2e6d29069 Stuff moved to cw.c 2022-08-14 13:37:28 +02:00
7u83 fc9ee8dfc2 commented out 2022-08-14 13:31:58 +02:00
7u83 143ffb1e08 base_exists and del_sub deleted 2022-08-14 13:31:35 +02:00
7u83 f17496592f cw_ktv_del_sub removed 2022-08-14 13:31:05 +02:00
7u83 e53b7f1142 Delete cw_ktv_del_sub 2022-08-14 12:43:34 +02:00
7u83 459e2e2aeb Lots done in move to typeless 2022-08-14 12:26:34 +02:00
7u83 b158544f1a uses cfg_list 2022-08-14 11:26:37 +02:00
7u83 46a932dc4b KTV -> CFG 2022-08-14 11:22:30 +02:00
7u83 ff8d520972 New msg_callbacks implemented and tested 2022-08-13 11:48:49 +02:00
7u83 a3f7a4fc1a Added msg_callbacks 2022-08-13 10:49:15 +02:00
7u83 c2e323c941 Formatting 2022-08-13 10:36:05 +02:00
7u83 3a8159320f Deleted cwmsg.h 2022-08-13 10:19:06 +02:00
7u83 6a64e28982 Removed conn->write_header 2022-08-13 10:18:29 +02:00
7u83 6dbf0bc706 Deleted 2022-08-13 09:52:05 +02:00
7u83 370942ef7e More work on typeless 2022-08-13 09:47:12 +02:00
7u83 add6ffa314 Completely removed cache 2022-08-13 02:02:52 +02:00
7u83 ce4a1dd2df Stae MAchine 2022-08-11 00:21:29 +02:00
7u83 e5f5687b2b Work on state machine 2022-08-11 00:21:01 +02:00
7u83 bf8a8c6d53 Deleted files 2022-08-10 21:36:58 +02:00
7u83 10b88b8f86 Renamed capwap_actions_ac 2022-08-10 21:32:16 +02:00
7u83 e6e8c8ed32 renamed cisco_actions_ac to cisco_actions 2022-08-10 13:37:46 +02:00
7u83 c5e1abb842 Renamed cw_put_msg to cw_assemble_message 2022-08-10 13:16:09 +02:00
7u83 9e54e46e45 More move to cw_Conn and conn-stuff within on file 2022-08-10 02:10:10 +02:00
7u83 f8654a0408 Removed conn_q_wait_packet 2022-08-10 01:02:45 +02:00
7u83 1703be9294 Deleted capwap_mode 2022-08-09 23:45:37 +02:00
7u83 d8f18f1a6a deleted capwap_mode 2022-08-09 23:44:35 +02:00
7u83 4b5b00009c Renamed struct conn to struct cw_Conn 2022-08-09 22:35:47 +02:00
7u83 3da4805c06 cw_in_check_cfg_update_req.c deleted 2022-08-09 21:54:26 +02:00
7u83 5b25d49b2b Removed unused code 2022-08-09 21:51:49 +02:00
7u83 484be39f78 Fixed: free interface name 2022-08-09 21:48:48 +02:00
7u83 0739d57aa6 param attribute added 2022-08-09 21:48:15 +02:00
7u83 fe16e62ef2 Deleted unused code 2022-08-09 21:47:39 +02:00
7u83 8a1a713c12 new type CW_TYPE_STRUCT 2022-08-09 21:45:46 +02:00
7u83 14e69d168b Discovery types and Mac types added 2022-08-09 18:17:10 +02:00
7u83 bc5e312ec4 Deleted some unused comments 2022-08-09 17:23:23 +02:00
7u83 d2240646f9 Removed cw_ElemHandlerParams.elem 2022-08-09 09:52:30 +02:00
7u83 8aa11dccba Moved from ktv to cfg 2022-08-08 23:14:11 +02:00
7u83 7d28858a70 New cmp funtion to get sorted integer arrays 2022-08-08 23:11:27 +02:00
7u83 8db182a303 Removed ktv stuff and switched to cfg 2022-08-08 23:10:31 +02:00
7u83 9452589625 ipv4 and ipv6 configurable 2022-08-08 23:09:28 +02:00
7u83 be3adf279d ipv4 and ipv6 are configurable 2022-08-08 23:09:10 +02:00
7u83 1544c6aa1b More example cfg 2022-08-08 23:08:38 +02:00
7u83 a3bc9dd09c Removed libconfuse-stuff, change to config.ckv 2022-08-08 23:07:58 +02:00
7u83 fb280d1c1c Removed libconfuse dependency 2022-08-08 23:06:56 +02:00
7u83 5240553144 Creates man pages 2022-08-08 08:40:14 +02:00
7u83 1598abee34 New config file 2022-08-01 10:08:01 +02:00
7u83 156466eab9 listen addrs are stored in cfg obj now 2022-08-01 10:06:18 +02:00
7u83 04d469b970 new function to traverse config
(Work in progress)
2022-08-01 10:05:14 +02:00
7u83 0e07e42167 No compiler warnings 2022-08-01 10:04:25 +02:00
7u83 4c37d89f03 Changed config.atv to ckv 2022-08-01 10:01:25 +02:00
7u83 6d9da94863 Better error handling. 2022-07-31 23:58:43 +02:00
7u83 1616d77a0f Much clean-up 2022-07-31 23:00:20 +02:00
7u83 a389003199 Fix: memory leak 2022-07-31 22:46:39 +02:00
7u83 eac5e73528 Fixed: memory leak 2022-07-31 22:44:58 +02:00
7u83 057a23d435 Unused project files 2022-07-31 22:08:52 +02:00
7u83 fb4a3a9d82 For Linux 2022-07-31 22:08:43 +02:00
7u83 495eda6abe Put ac_global into ac_main 2022-07-31 22:08:12 +02:00
7u83 906dd79c64 Better error handling 2022-07-31 21:42:48 +02:00
7u83 241e18a832 Removed ac_global 2022-07-31 21:40:47 +02:00
7u83 5c6779b80b Removed ac_global 2022-07-31 21:40:31 +02:00
7u83 284d15e58d Deleted acshell - not needed anymore 2022-07-31 21:26:49 +02:00
7u83 5da6c02b2d Removed libconfuse 2022-07-31 18:37:50 +02:00
Tobias Herre~tobias ee8d8c31d5 Some fixes to compile under FreeBSD 2022-07-31 18:34:53 +02:00
Tobias Herre~tobias 8ec8df566a Removed from AC some stuff
db - support
conf_sslcipher
2022-07-31 20:21:13 +02:00
Tobias Herre~tobias 809d6d1d2f Includes also from usr/local/include 2022-07-31 20:05:36 +02:00
7u83 12ad56ea95 Removed jsmn 2022-07-31 17:56:17 +02:00
7u83 e169ff8c70 Makefile for all 2022-07-31 17:22:02 +02:00
7u83 ba126051c5 Removed dependency of local file 2022-07-31 17:21:43 +02:00
7u83 a05bbf5fd6 Renamed KTV to Val. 2022-07-31 17:15:32 +02:00
7u83 996446d115 renamed cw_entry into cw_Cfg_entry
new function cw_cfg_get
2022-07-31 10:50:37 +02:00
7u83 a2e8e77468 new cfg (kv) reader implemented 2022-07-31 09:49:14 +02:00
7u83 35813e2cae Initial commit 2022-07-31 01:22:11 +02:00
7u83 80ddc96b9e Added cfg.c 2022-07-31 01:22:00 +02:00
7u83 dbbdce72fe Removed -lssl 2022-07-30 23:35:22 +02:00
7u83 2e3035f354 Removed ugly printf 2022-07-30 23:28:43 +02:00
7u83 1f572a2ac0 Removed unused stuff 2022-07-30 23:27:42 +02:00
7u83 b881698d8b Removed private stuff 2022-07-30 23:27:13 +02:00
7u83 c0038c2dd6 Fixed: returns mlistelem instead of dataptr 2022-07-30 22:59:24 +02:00
7u83 f12d9060f9 Fixed bad mavl storage size 2022-07-30 21:46:17 +02:00
7u83 2915110a8a Deleted a lot of unused stuff 2022-07-30 20:18:09 +02:00
7u83 d582503c78 Inserted a lot of debug printfs, fixed some bugs 2022-07-30 19:44:57 +02:00
7u83 ac58b6cc72 More complete decoding of Add Cisco WLAN msg elmnt 2022-07-30 18:25:09 +02:00
7u83 724260b664 Insert default types into types_tree 2022-07-30 10:32:50 +02:00
7u83 985ef22917 Fixed bug: overwriting orig config 2022-07-29 21:45:14 +02:00
7u83 7dab041047 Uses msgset.write_header and header_len again. 2022-07-29 12:11:19 +02:00
7u83 51416668c4 Fixed bug - recreateion of sockets when reopened 2022-07-29 09:18:55 +02:00
7u83 9106f5a0a3 Removed cw_write_header.c 2022-07-29 09:16:05 +02:00
7u83 15d0205f89 fixed include path 2022-07-28 18:34:10 +02:00
7u83 4506690fe1 Debuggin with cw_decode_msg is possible 2022-07-28 18:25:05 +02:00
7u83 6893cfa4d4 Wget owerwerites downloaded file 2022-07-28 02:46:56 +02:00
7u83 247bf23d3d Renamed install_libmav... 2022-07-28 02:46:32 +02:00
7u83 600b81b935 sript to install libmavl in contrib directory 2022-07-28 02:41:47 +02:00
7u83 ae40395ab7 Removed out-commented code 2022-07-28 02:02:42 +02:00
7u83 1955ee6dae new decode message funtion 2022-07-28 01:38:42 +02:00
7u83 5961ebffa3 New files 2022-07-28 01:38:06 +02:00
7u83 b894c00a7e moved local_cfg, remote_cfg ... to cw_ElemData struct 2022-07-28 01:36:16 +02:00
7u83 6ac1c87b2f New files 2022-07-28 01:34:56 +02:00
7u83 dca5d0e371 Cisco msg elem 9 and 81 added 2022-07-27 01:00:39 +02:00
7u83 13b0bf2941 Added more message elements 2022-07-27 00:06:53 +02:00
7u83 91c310b963 Fixed dbg packet len 2022-07-27 00:05:11 +02:00
7u83 3df3e28a2d Added malvl_freeptr again 2022-07-26 11:31:44 +02:00
7u83 84d953b7ed Fixed type 2022-07-23 20:27:28 +02:00
7u83 2408635be6 Direct Sequence Control added 2022-07-22 23:55:05 +02:00
7u83 8d09b1d596 Moved out most ob mavl_ into libmavl.
Current libmavl is here:
https://svn.planix.org/rsrch/trunk/libmavl
2022-07-18 01:15:17 +02:00
7u83 1734000f41 Verbosity option V=@ 2022-07-16 00:38:21 +02:00
7u83 6eae39d873 Changed Ciphers 2022-07-16 00:12:13 +02:00
7u83 f8a83ca463 partial conversion to OpenSSL 1.1.1 2022-07-11 08:26:56 +02:00
7u83 ddde491ba8 Use bsd makefiles 2022-07-10 12:25:14 +02:00
7u83 330b8a9d87 Added target dynamic and static 2022-07-09 11:51:53 +02:00
7u83 718dcbd45c bsdmake for cw 2022-07-09 03:06:51 +02:00
7u83 6929741620 For BSDMake 2022-07-09 01:47:04 +02:00
7u83 bef5391c9f chaned 2022-07-09 01:45:47 +02:00
7u83 84f022012e Changed 2022-07-09 01:43:00 +02:00
7u83 dee10595e1 Updated README 2022-07-09 01:30:14 +02:00
root 0f6cfb9eab qos in add wlan element added
FossilOrigin-Name: 7eb533db72ded8c6cc1aadf337a3ab527f07157a15a3f4e9fd5f1905885e7e27
2020-04-06 22:23:50 +00:00
root 2a4867af2c Catch profile name and bssid for 7.0 version
FossilOrigin-Name: 1f58bb3525accc366c1457fc1394e67adb10f149f3fe3fc454da5db7a07fecc6
2020-04-05 20:22:45 +00:00
root 2ade7f9ecb Added fields for WEP index, and WEP key and WEP encryption flag.
FossilOrigin-Name: 39e676a870a7d00467d44871e892ddc61d3b62d6d316256f53e457c8765ec172
2020-04-05 14:21:24 +00:00
root d58e7375c3 Introduced cisco_add_wlan70 data type
FossilOrigin-Name: 505e6eaf335498886eae788fb45e673392d5ab61ca24f6aabd5492d8b11ac674
2020-04-04 21:30:59 +00:00
root 8bec394f30 Added reg domain for radio 1
FossilOrigin-Name: 4bd8a9ad964102a745acf8b4fcec9508aa23dbfcc06187c97d92ea6b806fa50a
2020-04-03 22:44:03 +00:00
root 10ed1c6c75 conn_send_message basically replaced by cw_send_msg
FossilOrigin-Name: 27d87ea004c5844ab6c10612df780fcc3c7cd0c016b0a21794641f0076c8a9c4
2020-04-02 22:45:53 +00:00
root 9f41845f67 fixed retransmission
FossilOrigin-Name: be770d23bb7a4df7a4d72f4facf76d03f91a9079cdd7a968394c2035eafc6a89
2020-04-02 22:44:01 +00:00
root ef0474f0dd Added new funtion cw_send_msg w/o side effects
FossilOrigin-Name: a1ba8652a977192d847b140d512635be15680ed059e77f0aeb82d64a2c654283
2020-04-02 05:25:56 +00:00
root ebda2ed384 Chaned license
FossilOrigin-Name: c0107b8b5014178530ad40c508f672daeb84491d634c25d9d5e1e04706e48225
2020-03-29 22:30:11 +00:00
root c930068084 Changed date in license
FossilOrigin-Name: 8f2beb28cfb340b16b6a25bb591e8a2037b5a9d5d9b5f56667a1e967a6f41f68
2020-03-29 22:29:42 +00:00
root 2dfbda4395 Changed license
FossilOrigin-Name: 0a630d391e1ee5ea4214d38618748074830744d8be291b42159d7de840d65ce0
2020-03-29 22:29:15 +00:00
root ab25325e9f Fixed wrong results in cw_get_hdr_fragoffset and cw_get_hdr_fragid
FossilOrigin-Name: 1bc1c836eae499da08204f9b7740cef0df0a4feaf45514b8a220f8ebca288f42
2020-03-29 20:58:00 +00:00
root 725ecd80f7 Fixed headeris which were always 4 bytes too long.
FossilOrigin-Name: 7468efdf9f6842eea5cc985aff81476f62a83e76f59c381d131d9e624b2ba1ab
2020-03-20 20:12:50 +00:00
root d69b950242 fixed spelling of some keys
FossilOrigin-Name: 2db727e1dbc9e71f5d3eb27b06415f983fb21d7e83ba25414b5a7a666434cfe0
2020-03-14 22:17:49 +00:00
root a033cad0fb Correct naming of elements, Fixe: missing break in switch case
FossilOrigin-Name: 1cf82fffeef351ef1b8eb764db94203d21f3c1aa7957090969ece1692c499b61
2020-03-13 22:54:50 +00:00
root 1df562385c distingushes radio config v7.0 and 7.3 and 7.5
FossilOrigin-Name: 65536c860162dfa2018bcc0eff614a3100217f376e6248ce89ece3767178707e
2020-03-13 06:50:10 +00:00
root ddf7f3fa54 Some stuff to handle v7.0 APs
FossilOrigin-Name: 70fe6bf4324328395d4913d50ffa9919ee9a1bd01346f275690c464ce83d583a
2020-03-11 23:24:17 +00:00
root b9801df518 Primary discovery added
FossilOrigin-Name: ea6688861b5da5487653e218b7cbafa1b21507c49e75513cb7195cb82770c760
2020-03-11 22:46:56 +00:00
root 844b6964dc Added stuff for primary discovery
FossilOrigin-Name: 7d168c9495177d441ee09d53dd3aa87e961f9dceccb2ffd42393ef9a121cc2b7
2020-03-11 22:46:30 +00:00
root 01b913496d Uses $(ARCH) defined in ../Config.(default).mak
FossilOrigin-Name: 95b252e2e78afbe04d9b07f7e3c2f710d97bc0717c63ae60fe5e6f66bc7e8280
2020-03-11 22:13:19 +00:00
root 81c7efcd46 Removed crappy project files
FossilOrigin-Name: 58a7d3b1ffdab26615ffa88f0450437e5de97cb9564799d649b981e95862da80
2020-03-11 22:11:41 +00:00
root 98cd56e692 Works with BSDmake
FossilOrigin-Name: 743f6d8162ee9c5530c45febd7868d381f91b72dfae7daa83f52811cb33c634b
2020-03-11 22:09:56 +00:00
root 6591941172 Defines ARCH now.
FossilOrigin-Name: 95c2726ca43587755ed2f89ac6bf1ed397104a0dbc2975c9f54190b0861f40ab
2020-03-11 22:09:21 +00:00
root fa115a0ad6 actube compiles with bsd makefiles now
FossilOrigin-Name: a03d18a880737540cfa836e03f207832a3aa1c9e31766018ebebac9eef57c93f
2020-03-11 22:00:23 +00:00
280 changed files with 9310 additions and 12793 deletions

65
INSTALL
View File

@ -1,38 +1,57 @@
pre-requisites to build actube
==============================
On FreeBSD 10.2
Compile
=======
FreeBSD
----------------
pkg install gmake
pkg install gnutls
pkg install libconfuse
pkg install sqlite3
pkg install p11-kit
pkg install wget
pkg install nettle
cd src/contrib
sh install_libmavl
cd ..
make
Ubuntu 14.04
------------
Ubuntu
------
apt-get install build-essential clang
apt-get install nettle-dev
apt-get install libgnutls28-dev
apt-get install libssl-dev
apt-get install libconfuse-dev
apt-get install libsqlite3-dev
pre-requisites to build wtp
===========================
Ubuntu 14.04
------------
apt-get install cmake
apt-get install libnl-genl-3-dev
apt install libedit-dev
apt install bmake
cd src/contrib
sudo ./install_libuci.sh
sh install_libmavl
cd ..
bmake
RUN
---
Test start the ac with some debugging:
cd src/ac
export LD_LIBRARY_PATH=../../lib/<os name>/<arch>
./actube -d std -d info
Connect shell to the running AC:
cd src/ac
./act -s 127.0.0.1:5000
Some shell cmds:
list - list joined APs
select <name> - select an AP
cfg - show cfg of selected AC
ucfg - show current update cfg
set <key:bal> - set value in ucfg
send - send ucfg to AC
clear - clear ucfg

700
LICENSE
View File

@ -1,674 +1,26 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The GNU General Public License is a free, copyleft license for
software and other kinds of works.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors. You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
To protect your rights, we need to prevent others from denying you
these rights or asking you to surrender the rights. Therefore, you have
certain responsibilities if you distribute copies of the software, or if
you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received. You must make sure that they, too, receive
or can get the source code. And you must show them these terms so they
know their rights.
Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.
For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software. For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.
Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so. This is fundamentally incompatible with the aim of
protecting users' freedom to change the software. The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable. Therefore, we
have designed this version of the GPL to prohibit the practice for those
products. If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.
Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Use with the GNU Affero General Public License.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU Affero General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the special requirements of the GNU Affero General Public License,
section 13, concerning interaction through a network will apply to the
combination as such.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
{one line to give the program's name and a brief idea of what it does.}
Copyright (C) {year} {name of author}
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
{project} Copyright (C) {year} {fullname}
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<http://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
/*
* Copyright 2013,2020, The PLANIX Project
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

View File

@ -1,30 +1,23 @@
TARGETS=\
src/contrib/jsmn \
src/cw
.OBJDIR: ./
#src/cw src/mod src/ac
all:
#$(foreach i,$(TARGETS),$(call $(MAKE) -c, $i))
$(MAKE) -C src/contrib/jsmn
$(MAKE) -C src/cw
$(MAKE) -C src/mod
$(MAKE) -C src/ac
all: ac wtp
clean:
#$(foreach i,$(TARGETS),$(call $(MAKE) -c, $i))
$(MAKE) -C src/contrib/jsmn clean
$(MAKE) -C src/cw clean
$(MAKE) -C src/mod clean
$(MAKE) -C src/ac clean
$(MAKE) -C src/wtp clean
cw:
$(MAKE) -C src/cw
ac: cw mod
$(MAKE) -C src/ac
wtp: cw mod
$(MAKE) -C src/wtp
mod: cw
$(MAKE) -C src/mod

View File

@ -1,8 +1,5 @@
AC-Tube
=======
On Github this is a mirror of
https://fossil.planix.org/actube/
Open Source CAPWAP WLC + WTP
Current status: early development.

1
include/README Normal file
View File

@ -0,0 +1 @@
this is an include directroy

View File

@ -1,121 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<CodeLite_Project Name="mod_capwap" InternalType="">
<VirtualDirectory Name="src">
<VirtualDirectory Name="mod">
<VirtualDirectory Name="capwap">
<File Name="src/mod/capwap/capwap_out_ac_ip_list.c"/>
<File Name="src/mod/capwap/mod_capwap_ac.c"/>
<File Name="src/mod/capwap/capwap_in_wtp_board_data.c"/>
<File Name="src/mod/capwap/capwap_actions_wtp.c"/>
<File Name="src/mod/capwap/mod_capwap_wtp.c"/>
<File Name="src/mod/capwap/capwap_out_ac_descriptor.c"/>
<File Name="src/mod/capwap/capwap_in_ac_ip_list.c"/>
<File Name="src/mod/capwap/mod_capwap.h"/>
<File Name="src/mod/capwap/capwap_in_wtp_descriptor.c"/>
<File Name="src/mod/capwap/capwap_in_session_id.c"/>
<File Name="src/mod/capwap/capwap_out_get_session_id.c"/>
<File Name="src/mod/capwap/capwap_out_get_idle_timeout.c"/>
<File Name="src/mod/capwap/capwap_actions_ac.c"/>
<File Name="src/mod/capwap/capwap_in_vendor_specific_payload.c"/>
<File Name="src/mod/capwap/capwap_in_mtu_discovery_padding.c"/>
<File Name="src/mod/capwap/capwap_out_wtp_board_data.c"/>
<File Name="src/mod/capwap/capwap_out_wtp_descriptor.c"/>
<File Name="src/mod/capwap/capwap_out_capwap_control_ip_address.c"/>
<File Name="src/mod/capwap/capwap_in_capwap_control_ip_address.c"/>
<File Name="src/mod/capwap/capwap_in_ac_descriptor.c"/>
<File Name="src/mod/capwap/capwap_out_capwap_local_ip_address.c"/>
</VirtualDirectory>
</VirtualDirectory>
</VirtualDirectory>
<Description/>
<Dependencies/>
<Settings Type="Dynamic Library">
<GlobalSettings>
<Compiler Options="" C_Options="" Assembler="">
<IncludePath Value="."/>
</Compiler>
<Linker Options="">
<LibraryPath Value="."/>
</Linker>
<ResourceCompiler Options=""/>
</GlobalSettings>
<Configuration Name="Debug" CompilerType="clang( tags/RELEASE_380/final )" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
<Compiler Options="-g" C_Options="-g" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
<IncludePath Value="."/>
</Compiler>
<Linker Options="" Required="yes"/>
<ResourceCompiler Options="" Required="no"/>
<General OutputFile="" IntermediateDirectory="./Debug" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
<![CDATA[]]>
</Environment>
<Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="" IsExtended="no">
<DebuggerSearchPaths/>
<PostConnectCommands/>
<StartupCommands/>
</Debugger>
<PreBuild/>
<PostBuild/>
<CustomBuild Enabled="yes">
<RebuildCommand>make clean &amp;&amp; make</RebuildCommand>
<CleanCommand>make clean</CleanCommand>
<BuildCommand>make</BuildCommand>
<PreprocessFileCommand/>
<SingleFileCommand/>
<MakefileGenerationCommand/>
<ThirdPartyToolName>None</ThirdPartyToolName>
<WorkingDirectory>$(WorkspacePath)/src/mod/capwap/</WorkingDirectory>
</CustomBuild>
<AdditionalRules>
<CustomPostBuild/>
<CustomPreBuild/>
</AdditionalRules>
<Completion EnableCpp11="no" EnableCpp14="no">
<ClangCmpFlagsC/>
<ClangCmpFlags/>
<ClangPP/>
<SearchPaths/>
</Completion>
</Configuration>
<Configuration Name="Release" CompilerType="clang( tags/RELEASE_380/final )" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
<Compiler Options="" C_Options="" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
<IncludePath Value="."/>
</Compiler>
<Linker Options="-O2" Required="yes"/>
<ResourceCompiler Options="" Required="no"/>
<General OutputFile="" IntermediateDirectory="./Release" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
<![CDATA[]]>
</Environment>
<Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="" IsExtended="no">
<DebuggerSearchPaths/>
<PostConnectCommands/>
<StartupCommands/>
</Debugger>
<PreBuild/>
<PostBuild/>
<CustomBuild Enabled="yes">
<RebuildCommand/>
<CleanCommand>make clean</CleanCommand>
<BuildCommand>make</BuildCommand>
<PreprocessFileCommand/>
<SingleFileCommand/>
<MakefileGenerationCommand/>
<ThirdPartyToolName>None</ThirdPartyToolName>
<WorkingDirectory>$(WorkspacePath)</WorkingDirectory>
</CustomBuild>
<AdditionalRules>
<CustomPostBuild/>
<CustomPreBuild/>
</AdditionalRules>
<Completion EnableCpp11="no" EnableCpp14="no">
<ClangCmpFlagsC/>
<ClangCmpFlags/>
<ClangPP/>
<SearchPaths/>
</Completion>
</Configuration>
</Settings>
<Dependencies Name="Debug"/>
<Dependencies Name="Release"/>
</CodeLite_Project>

View File

@ -1,105 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<CodeLite_Project Name="mod_capwap80211" InternalType="">
<VirtualDirectory Name="src">
<VirtualDirectory Name="mod">
<VirtualDirectory Name="capwap80211">
<File Name="src/mod/capwap80211/mod_capwap80211.h"/>
<File Name="src/mod/capwap80211/capwap80211_out_wtp_radio_cfg.c"/>
<File Name="src/mod/capwap80211/mod_capwap80211.c"/>
<File Name="src/mod/capwap80211/capwap80211_messages.c"/>
</VirtualDirectory>
</VirtualDirectory>
</VirtualDirectory>
<Description/>
<Dependencies/>
<Settings Type="Dynamic Library">
<GlobalSettings>
<Compiler Options="" C_Options="" Assembler="">
<IncludePath Value="."/>
</Compiler>
<Linker Options="">
<LibraryPath Value="."/>
</Linker>
<ResourceCompiler Options=""/>
</GlobalSettings>
<Configuration Name="Debug" CompilerType="GCC" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
<Compiler Options="-g" C_Options="-g" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
<IncludePath Value="."/>
</Compiler>
<Linker Options="" Required="yes"/>
<ResourceCompiler Options="" Required="no"/>
<General OutputFile="" IntermediateDirectory="./Debug" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
<![CDATA[]]>
</Environment>
<Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="" IsExtended="no">
<DebuggerSearchPaths/>
<PostConnectCommands/>
<StartupCommands/>
</Debugger>
<PreBuild/>
<PostBuild/>
<CustomBuild Enabled="yes">
<RebuildCommand>make clean &amp;&amp; make
</RebuildCommand>
<CleanCommand>make clean</CleanCommand>
<BuildCommand>make</BuildCommand>
<PreprocessFileCommand/>
<SingleFileCommand/>
<MakefileGenerationCommand/>
<ThirdPartyToolName>None</ThirdPartyToolName>
<WorkingDirectory>$(WorkspacePath)/src/mod/capwap80211/</WorkingDirectory>
</CustomBuild>
<AdditionalRules>
<CustomPostBuild/>
<CustomPreBuild/>
</AdditionalRules>
<Completion EnableCpp11="no" EnableCpp14="no">
<ClangCmpFlagsC/>
<ClangCmpFlags/>
<ClangPP/>
<SearchPaths/>
</Completion>
</Configuration>
<Configuration Name="Release" CompilerType="GCC" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
<Compiler Options="" C_Options="" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
<IncludePath Value="."/>
</Compiler>
<Linker Options="-O2" Required="yes"/>
<ResourceCompiler Options="" Required="no"/>
<General OutputFile="" IntermediateDirectory="./Release" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
<![CDATA[]]>
</Environment>
<Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="" IsExtended="no">
<DebuggerSearchPaths/>
<PostConnectCommands/>
<StartupCommands/>
</Debugger>
<PreBuild/>
<PostBuild/>
<CustomBuild Enabled="yes">
<RebuildCommand/>
<CleanCommand>make clean</CleanCommand>
<BuildCommand>make</BuildCommand>
<PreprocessFileCommand/>
<SingleFileCommand/>
<MakefileGenerationCommand/>
<ThirdPartyToolName>None</ThirdPartyToolName>
<WorkingDirectory>$(WorkspacePath)</WorkingDirectory>
</CustomBuild>
<AdditionalRules>
<CustomPostBuild/>
<CustomPreBuild/>
</AdditionalRules>
<Completion EnableCpp11="no" EnableCpp14="no">
<ClangCmpFlagsC/>
<ClangCmpFlags/>
<ClangPP/>
<SearchPaths/>
</Completion>
</Configuration>
</Settings>
<Dependencies Name="Debug"/>
<Dependencies Name="Release"/>
</CodeLite_Project>

View File

@ -1,105 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<CodeLite_Project Name="mod_cipwap" InternalType="">
<VirtualDirectory Name="src">
<VirtualDirectory Name="mod">
<VirtualDirectory Name="cipwap">
<File Name="src/mod/cipwap/cipwap_actions_ac.c"/>
<File Name="src/mod/cipwap/mod_cipwap_ac.c"/>
<File Name="src/mod/cipwap/mod_cipwap.h"/>
<File Name="src/mod/cipwap/mod_cipwap_wtp.c"/>
<File Name="src/mod/cipwap/cipwap_actions_wtp.c"/>
</VirtualDirectory>
</VirtualDirectory>
</VirtualDirectory>
<Description/>
<Dependencies/>
<Settings Type="Dynamic Library">
<GlobalSettings>
<Compiler Options="" C_Options="" Assembler="">
<IncludePath Value="."/>
</Compiler>
<Linker Options="">
<LibraryPath Value="."/>
</Linker>
<ResourceCompiler Options=""/>
</GlobalSettings>
<Configuration Name="Debug" CompilerType="clang( tags/RELEASE_380/final )" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
<Compiler Options="-g" C_Options="-g" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
<IncludePath Value="."/>
</Compiler>
<Linker Options="" Required="yes"/>
<ResourceCompiler Options="" Required="no"/>
<General OutputFile="" IntermediateDirectory="./Debug" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
<![CDATA[]]>
</Environment>
<Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="" IsExtended="no">
<DebuggerSearchPaths/>
<PostConnectCommands/>
<StartupCommands/>
</Debugger>
<PreBuild/>
<PostBuild/>
<CustomBuild Enabled="yes">
<RebuildCommand>make clean &amp;&amp; make</RebuildCommand>
<CleanCommand>make clean</CleanCommand>
<BuildCommand>make</BuildCommand>
<PreprocessFileCommand/>
<SingleFileCommand/>
<MakefileGenerationCommand/>
<ThirdPartyToolName>None</ThirdPartyToolName>
<WorkingDirectory>$(WorkspacePath)/src/mod/cipwap</WorkingDirectory>
</CustomBuild>
<AdditionalRules>
<CustomPostBuild/>
<CustomPreBuild/>
</AdditionalRules>
<Completion EnableCpp11="no" EnableCpp14="no">
<ClangCmpFlagsC/>
<ClangCmpFlags/>
<ClangPP/>
<SearchPaths/>
</Completion>
</Configuration>
<Configuration Name="Release" CompilerType="clang( tags/RELEASE_380/final )" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
<Compiler Options="" C_Options="" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
<IncludePath Value="."/>
</Compiler>
<Linker Options="-O2" Required="yes"/>
<ResourceCompiler Options="" Required="no"/>
<General OutputFile="" IntermediateDirectory="./Release" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
<![CDATA[]]>
</Environment>
<Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="" IsExtended="no">
<DebuggerSearchPaths/>
<PostConnectCommands/>
<StartupCommands/>
</Debugger>
<PreBuild/>
<PostBuild/>
<CustomBuild Enabled="yes">
<RebuildCommand/>
<CleanCommand>make clean</CleanCommand>
<BuildCommand>make</BuildCommand>
<PreprocessFileCommand/>
<SingleFileCommand/>
<MakefileGenerationCommand/>
<ThirdPartyToolName>None</ThirdPartyToolName>
<WorkingDirectory>$(WorkspacePath)</WorkingDirectory>
</CustomBuild>
<AdditionalRules>
<CustomPostBuild/>
<CustomPreBuild/>
</AdditionalRules>
<Completion EnableCpp11="no" EnableCpp14="no">
<ClangCmpFlagsC/>
<ClangCmpFlags/>
<ClangPP/>
<SearchPaths/>
</Completion>
</Configuration>
</Settings>
<Dependencies Name="Debug"/>
<Dependencies Name="Release"/>
</CodeLite_Project>

View File

@ -1,136 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<CodeLite_Project Name="mod_cisco" InternalType="">
<VirtualDirectory Name="src">
<VirtualDirectory Name="mod">
<VirtualDirectory Name="cisco">
<File Name="src/mod/cisco/cisco_out_telnet_ssh.c"/>
<File Name="src/mod/cisco/cisco_out_capwap_up.c"/>
<File Name="src/mod/cisco/cisco_in_telnet_ssh.c"/>
<File Name="src/mod/cisco/cisco_in_radio_administrative_state.c"/>
<File Name="src/mod/cisco/cisco_actions_wtp.c"/>
<File Name="src/mod/cisco/cisco_out_wtp_descriptor.c"/>
<File Name="src/mod/cisco/cisco_out_wtp_administrative_state.c"/>
<File Name="src/mod/cisco/cisco_out_ac_descriptor.c"/>
<File Name="src/mod/cisco/cw_in_check_disc_req.c"/>
<File Name="src/mod/cisco/mod_cisco_ac.c"/>
<File Name="src/mod/cisco/cisco_in_ac_descriptor.c"/>
<File Name="src/mod/cisco/cisco_out_ac_ipv4_list.c"/>
<File Name="src/mod/cisco/cisco_actions_ac.c"/>
<File Name="src/mod/cisco/cisco_in_wtp_descriptor.c"/>
<File Name="src/mod/cisco/cisco_out_radio_operational_state.c"/>
<File Name="src/mod/cisco/cisco_out_wtp_operational_state.c"/>
<File Name="src/mod/cisco/cisco_out_manager_ip_addr.c"/>
<File Name="src/mod/cisco/cisco_in_spam_vendor_specific.c"/>
<File Name="src/mod/cisco/cisco_in_radio_operational_state.c"/>
<File Name="src/mod/cisco/cisco_out_board_data_options.c"/>
<File Name="src/mod/cisco/cisco80211_out_wtp_radio_configuration.c"/>
<File Name="src/mod/cisco/cisco_in_add_wlan.c"/>
<File Name="src/mod/cisco/cisco80211_in_mac_operation.c"/>
<File Name="src/mod/cisco/cisco80211_in_wtp_radio_configuration.c"/>
<File Name="src/mod/cisco/cisco80211.h"/>
<File Name="src/mod/cisco/cisco.h"/>
<File Name="src/mod/cisco/cisco_out_ap_timesync.c"/>
<File Name="src/mod/cisco/mod_cisco_wtp.c"/>
<File Name="src/mod/cisco/cisco80211.c"/>
<File Name="src/mod/cisco/mod_cisco.h"/>
<File Name="src/mod/cisco/capwap_cisco.h"/>
<File Name="src/mod/cisco/cisco_out_radio_generic.c"/>
<File Name="src/mod/cisco/cisco_out_capwap_local_ip_address.c"/>
<File Name="src/mod/cisco/cisco_out_lw_path_mtu.c"/>
<File Name="src/mod/cisco/lwapp_cisco.h"/>
<File Name="src/mod/cisco/cisco_in_ap_regulatory_domain.c"/>
</VirtualDirectory>
</VirtualDirectory>
</VirtualDirectory>
<Description/>
<Dependencies/>
<Dependencies Name="Debug"/>
<Dependencies Name="Release"/>
<Settings Type="Dynamic Library">
<GlobalSettings>
<Compiler Options="" C_Options="" Assembler="">
<IncludePath Value="."/>
</Compiler>
<Linker Options="">
<LibraryPath Value="."/>
</Linker>
<ResourceCompiler Options=""/>
</GlobalSettings>
<Configuration Name="Debug" CompilerType="clang( tags/RELEASE_380/final )" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
<Compiler Options="-g" C_Options="-g" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
<IncludePath Value="."/>
</Compiler>
<Linker Options="" Required="yes"/>
<ResourceCompiler Options="" Required="no"/>
<General OutputFile="" IntermediateDirectory="./Debug" Command="$(WorkspacePath)/src/wtp/wtp" CommandArguments="-dall -mcisco -ccisco.ktv" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(WorkspacePath)/src/wtp/" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
<![CDATA[]]>
</Environment>
<Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="" IsExtended="no">
<DebuggerSearchPaths/>
<PostConnectCommands/>
<StartupCommands/>
</Debugger>
<PreBuild/>
<PostBuild/>
<CustomBuild Enabled="yes">
<RebuildCommand>make clean &amp;&amp; make</RebuildCommand>
<CleanCommand>make clean</CleanCommand>
<BuildCommand>make</BuildCommand>
<PreprocessFileCommand/>
<SingleFileCommand/>
<MakefileGenerationCommand/>
<ThirdPartyToolName>None</ThirdPartyToolName>
<WorkingDirectory>$(WorkspacePath)/src/mod/cisco</WorkingDirectory>
</CustomBuild>
<AdditionalRules>
<CustomPostBuild/>
<CustomPreBuild/>
</AdditionalRules>
<Completion EnableCpp11="no" EnableCpp14="no">
<ClangCmpFlagsC/>
<ClangCmpFlags/>
<ClangPP/>
<SearchPaths/>
</Completion>
</Configuration>
<Configuration Name="Release" CompilerType="clang( tags/RELEASE_380/final )" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
<Compiler Options="" C_Options="" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
<IncludePath Value="."/>
</Compiler>
<Linker Options="-O2" Required="yes"/>
<ResourceCompiler Options="" Required="no"/>
<General OutputFile="" IntermediateDirectory="./Release" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
<![CDATA[]]>
</Environment>
<Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="" IsExtended="no">
<DebuggerSearchPaths/>
<PostConnectCommands/>
<StartupCommands/>
</Debugger>
<PreBuild/>
<PostBuild/>
<CustomBuild Enabled="yes">
<RebuildCommand/>
<CleanCommand>make clean</CleanCommand>
<BuildCommand>make</BuildCommand>
<PreprocessFileCommand/>
<SingleFileCommand/>
<MakefileGenerationCommand/>
<ThirdPartyToolName>None</ThirdPartyToolName>
<WorkingDirectory>$(WorkspacePath)</WorkingDirectory>
</CustomBuild>
<AdditionalRules>
<CustomPostBuild/>
<CustomPreBuild/>
</AdditionalRules>
<Completion EnableCpp11="no" EnableCpp14="no">
<ClangCmpFlagsC/>
<ClangCmpFlags/>
<ClangPP/>
<SearchPaths/>
</Completion>
</Configuration>
</Settings>
</CodeLite_Project>

View File

@ -1,104 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<CodeLite_Project Name="mod_fortinet" InternalType="">
<VirtualDirectory Name="src">
<VirtualDirectory Name="mod">
<VirtualDirectory Name="fortinet">
<File Name="src/mod/fortinet/mod_fortinet_ac.c"/>
<File Name="src/mod/fortinet/mod_fortinet_wtp.c"/>
<File Name="src/mod/fortinet/fortinet.h"/>
<File Name="src/mod/fortinet/fortinet_actions_ac.c"/>
<File Name="src/mod/fortinet/fortinet_actions_wtp.c"/>
<File Name="src/mod/fortinet/mod_fortinet.h"/>
</VirtualDirectory>
</VirtualDirectory>
</VirtualDirectory>
<Description/>
<Dependencies/>
<Settings Type="Dynamic Library">
<GlobalSettings>
<Compiler Options="" C_Options="" Assembler="">
<IncludePath Value="."/>
</Compiler>
<Linker Options="">
<LibraryPath Value="."/>
</Linker>
<ResourceCompiler Options=""/>
</GlobalSettings>
<Configuration Name="Debug" CompilerType="GCC" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
<Compiler Options="-g" C_Options="-g" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
<IncludePath Value="."/>
</Compiler>
<Linker Options="" Required="yes"/>
<ResourceCompiler Options="" Required="no"/>
<General OutputFile="" IntermediateDirectory="./Debug" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
<![CDATA[]]>
</Environment>
<Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="" IsExtended="no">
<DebuggerSearchPaths/>
<PostConnectCommands/>
<StartupCommands/>
</Debugger>
<PreBuild/>
<PostBuild/>
<CustomBuild Enabled="yes">
<RebuildCommand>make clean &amp;&amp; make</RebuildCommand>
<CleanCommand>make clean</CleanCommand>
<BuildCommand>make</BuildCommand>
<PreprocessFileCommand/>
<SingleFileCommand/>
<MakefileGenerationCommand/>
<ThirdPartyToolName>None</ThirdPartyToolName>
<WorkingDirectory>$(WorkspacePath)/src/mod/fortinet</WorkingDirectory>
</CustomBuild>
<AdditionalRules>
<CustomPostBuild/>
<CustomPreBuild/>
</AdditionalRules>
<Completion EnableCpp11="no" EnableCpp14="no">
<ClangCmpFlagsC/>
<ClangCmpFlags/>
<ClangPP/>
<SearchPaths/>
</Completion>
</Configuration>
<Configuration Name="Release" CompilerType="GCC" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
<Compiler Options="" C_Options="" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
<IncludePath Value="."/>
</Compiler>
<Linker Options="-O2" Required="yes"/>
<ResourceCompiler Options="" Required="no"/>
<General OutputFile="" IntermediateDirectory="./Release" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
<![CDATA[]]>
</Environment>
<Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="" IsExtended="no">
<DebuggerSearchPaths/>
<PostConnectCommands/>
<StartupCommands/>
</Debugger>
<PreBuild/>
<PostBuild/>
<CustomBuild Enabled="yes">
<RebuildCommand/>
<CleanCommand>make clean</CleanCommand>
<BuildCommand>make</BuildCommand>
<PreprocessFileCommand/>
<SingleFileCommand/>
<MakefileGenerationCommand/>
<ThirdPartyToolName>None</ThirdPartyToolName>
<WorkingDirectory>$(WorkspacePath)</WorkingDirectory>
</CustomBuild>
<AdditionalRules>
<CustomPostBuild/>
<CustomPreBuild/>
</AdditionalRules>
<Completion EnableCpp11="no" EnableCpp14="no">
<ClangCmpFlagsC/>
<ClangCmpFlags/>
<ClangPP/>
<SearchPaths/>
</Completion>
</Configuration>
</Settings>
</CodeLite_Project>

View File

@ -1,4 +0,0 @@
include ../Config.mak
WITH_GNUTLS=1
WITH_OPENSSL=1

View File

@ -1,47 +0,0 @@
#
# OpenSSL definitions
# Chose either the contrib version or the system installed version
#
#OPENSSL_VERSION=openssl-1.0.1i
#OPENSSL_LIBS=../contrib/${OPENSSL_VERSION}/libssl.a ../contrib/${OPENSSL_VERSION}/libcrypto.a -ldl
#OPENSSL_CFLAGS=../contrib/${OPENSSL_VERSION}/include/
OPENSSL_LIBS=-lssl -lcrypto #-ldl
OPENSSL_CFLAGS=
# GnuTLS definitions
# GNUTLS_VERSION=3.3.9
USE_CONTRIB_GNUTLS=0
COMPDEFS=-DWITH_CW_LOG
COMPDEFS+=-DWITH_CW_LOG_DEBUG
#
# LIBCW settings
# WITH_GNUTLS
# compile in support for GnuTLS
#
WITH_GNUTLS=1
#
# Compile in openssl support
#
WITH_OPENSSL=1
#
#
LIBDIR=lib
OPTFLAGS := -g -O0
#CFLAGS := -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_DEFAULT_SOURCE=1 -pedantic -std=c99 -Wall

View File

@ -1,5 +1,6 @@
ifndef ARCH
ARCH = $(shell uname -m)
endif
ARCH!=uname -m
KERNEL!=uname -s
-include LocalDefs.mak

View File

@ -0,0 +1,6 @@
CFLAGS+=-Wall -g -O0 -fsanitize=address -fPIC
LIBS=-lasan
CC=clang

View File

@ -1,51 +0,0 @@
ifeq (${USE_CONTRIB_OPENSSL},1)
OPENSSL_LIBS=../contrib/${OPENSSL_VERSION}/libssl.a ../contrib/${OPENSSL_VERSION}/libcrypto.a -ldl
OPENSSL_CFLAGS=../contrib/${OPENSSL_VERSION}/include/
else
OPENSSL_LDFLAGS=
OPENSSL_CFLAGS=
OPENSSL_LIBS=-lssl -lcrypto #-ldl
endif
ifeq ($(USE_CONTRIB_GNUTLS),1)
GNUTLS_CFLAGS=-I../contrib/gnutls-${GNUTLS_VERSION}/lib/includes
GNUTLS_LIBS=-lgmp -lgnutls -lnettle
GNUTLS_LDFLAGS=-L../contrib/gnutls-${GNUTLS_VERSION}/lib/.libs/
else
GNUTLS_CFLAGS=
GNUTLS_LIBS=-lgnutls -lnettle -lgmp
GNUTLS_LDFLAGS=
endif
ifeq ($(CC),clang)
LDFLAGS += -g -L/usr/local/lib
CFLAGS += -fPIC $(OPTFLAGS) -D_REENTRANT -I /usr/local/include -I../
LD = clang
endif
ifeq ($(CC),gcc)
LDFLAGS += -g -L/usr/local/lib
CFLAGS += -fPIC $(OPTFLAGS) -D_REENTRANT -I /usr/local/include -I../
LD = gcc
endif
ifeq ($(CC),tcc)
LDFLAGS += -g -L/usr/local/lib
CFLAGS += -Wall $(OPTFLAGS) -Wunusupported -Wimplicit-function-declaration -I /usr/local/include -I../
LD = tcc
endif
ifeq ($(CC),cc)
LDFLAGS += -g -L/usr/local/lib
CFLAGS += -fPIC $(OPTFLAGS) -D_REENTRANT -I /usr/local/include -I../
LD = cc
endif
CFLAGS += -DWITH_IPV6 -DWITH_RMAC_SUPPORT

View File

@ -4,7 +4,7 @@ include ../Config.mak
# Define witch SSL library to use
# OPENSSL or GNUTLS
#
SSL_LIBRARY=OPENSSL
SSL_LIBRARY=GNUTLS
CFLAGS += -I/usr/include/libnl3
CFLAGS += -I../contrib/uci

View File

@ -1,45 +1,57 @@
include ../Config.default.mak
-include ../Config.mak
#include ../Config.default.mak
#-include ../Config.mak
include ../Defs.mak
OBJS = \
wtplist.o wtpman.o conf.o ac_main.o \
dataman.o \
ac_interface.o \
socklist.o \
db.o \
ac_global.o \
discovery_cache.o\
shell.o\
rpc.o\
statemachine.o\
ARCH != uname -m
ACTOBJS = \
act.o
ACTPRG=act
PRG=actube
LIBPATH=-L../../lib/$(ARCH)/ -L/usr/local/lib -L/usr/lib
LIBPATH=-L../../lib/$(KERNEL)/$(ARCH)/ -L/usr/local/lib -L/usr/lib
LIBS+=-lmavl
LIBS+=-lcw
LIBS+=-lrt
LIBS+=-lpthread
LIBS+=-lconfuse
LIBS+=-lsqlite3
LIBS+=-lc
LIBS+=$(OPENSSL_LIBS)
LIBS+=-lnettle
LIBS+=-lssl
LIBS+=-lcrypto
LIBS+=-ledit
INCL_DIRS=-I../ -I/usr/local/include -I./
INCL_DIRS=-I../ -I/usr/local/include -I./ -I../../include
#FLAGS=-DWITH_IPV6 -DWITH_OPENSSL -DSYS_ARCH="$(ARCH)" -DSYS_ARCH="XXX"
FLAGS=-DWITH_IPV6 -DWITH_OPENSSL -DSYS_ARCH='"$(ARCH)"'
FLAGS=-DWITH_IPV6 -DUSE_OPENSSL -DSYS_ARCH='"$(KERNEL)/$(ARCH)"'
.c.o:
@echo " $(CC) "$<
$(CC) $(FLAGS) $(INCL_DIRS) -c $(CFLAGS) $< -o $@
all: $(PRG) $(ACTPRG)
$(PRG): $(OBJS)
# $(CC) $(AC_OBJS) ../mod/modload_ac.o -o $(AC_NAME) $(LDFLAGS) $(LIBS)
$(CC) $(LIBS) $(OBJS) -o $(PRG) $(LIBPATH) $(LDFLAGS) $(LIBS)
$(CC) $(OBJS) -o $(PRG) $(LIBPATH) $(LDFLAGS) $(LIBS)
$(ACTPRG): $(ACTOBJS)
$(CC) $(ACTOBJS) -o $(ACTPRG) $(LIBPATH) $(LDFLAGS) $(LIBS) -ledit
clean:
rm -f $(PRG) $(OBJS)
rm -f $(PRG) $(OBJS)
rm -f $(ACTPRG) $(ACTOBJS)

View File

@ -184,7 +184,7 @@ ssl_key="../../ssl/certs/ac-cisco.key"
# SSL certificate that will be sent to the client
#
# Default:
ssl_cert="../../ssl/certs/ac-cisco.pem"
ssl_cert="../../ssl/certs/ac-xcisco.pem"
# dtls_verify_peer
@ -197,31 +197,31 @@ ssl_cert="../../ssl/certs/ac-cisco.pem"
# dbg
# Set debug level
#
dbg = info # Show all kind of infos
# dbg = info # Show all kind of infos
# dbg += all
dbg += msg_in # Incomming CAPWAP messages
dbg += msg_out # Outgoing CAPWAP messages
dbg += msg_err # Be verbose about capwap message errors like re-transmission
dbg += msg_dmp
dbg += elem_in # CAPWAP message elements
dbg += elem_out
dbg += subelem #
dbg += elem_err # Errors in message elements
dbg += elem_dmp # Print hex dump for capwap messages elements
dbg += rfc # Show warnings if CAPWAP messages don't conform to RFC
dbg += pkt_in # CAPWAP packets received
dbg += pkt_out # CAPWAP packets sent
dbg += pkt # CAPWAP packets both sent and received
dbg += pkt_dmp # Hex dump CAPWAP packets.
dbg += pkt_err # Show messages about malformed packets when detected
dbg += dtls # Messages concerning DTLS
# dbg += msg_in # Incomming CAPWAP messages
# dbg += msg_out # Outgoing CAPWAP messages
# dbg += msg_err # Be verbose about capwap message errors like re-transmission
# dbg += msg_dmp
# dbg += elem_in # CAPWAP message elements
# dbg += elem_out
# dbg += subelem #
# dbg += elem_err # Errors in message elements
# dbg += elem_dmp # Print hex dump for capwap messages elements
# dbg += rfc # Show warnings if CAPWAP messages don't conform to RFC
# dbg += pkt_in # CAPWAP packets received
# dbg += pkt_out # CAPWAP packets sent
# dbg += pkt # CAPWAP packets both sent and received
# dbg += pkt_dmp # Hex dump CAPWAP packets.
# dbg += pkt_err # Show messages about malformed packets when detected
# dbg += dtls # Messages concerning DTLS
# dbg += dtls_detail # DTLS in more detail
dbg += dtls_bio # DTLS BIO operations
# dbg += dtls_bio # DTLS BIO operations
# dbg += dtls_bio_dmp # HeXy dump data in BIO operations
dbg += warn # misc warnings
dbg += mod # Debugs specific to mod
dbg += cfg_dmp
dbg += state
# dbg += warn # misc warnings
# dbg = mod # Debugs specific to mod
# dbg += cfg_dmp
# dbg += state
#
# dbg += all # all of the above
# dbg += err # Same as dbg_err and pkt_err
@ -239,7 +239,7 @@ ssl_cert="../../ssl/certs/ac-cisco.pem"
#
#mods = { cisco, capwap }
mods = { cisco, capwap, capwap80211 }
mods = { cisco,capwap, capwap80211 }
#, capwap80211 }
mods_dir = ../../lib
mods_dir = ../../lib/Linux/x86_64/

View File

@ -1,10 +1,7 @@
#ifndef __ACTUBE_AC_H
#define __ACTUBE_AC_H
#include "cw/mavl.h"
extern mavl_t actube_global_cfg;
#include "cw/cfg.h"
extern struct ac_status ac_global_status;
@ -20,6 +17,8 @@ enum {
AC_PROTO_UNKNOWN
};
int start_rpc(cw_Cfg_t *global_cfg);
int test_shell();
#endif

View File

@ -1,118 +0,0 @@
#include <stdlib.h>
#include "ac.h"
#include "conf.h"
#include "cw/capwap.h"
/*#include "cw/aciplist.h"*/
#include "socklist.h"
#include "cw/sock.h"
#include "cw/dbg.h"
#include "wtpman.h"
#include "discovery_cache.h"
mavl_t actube_global_cfg;
/*
cw_aciplist_t get_aciplist()
{
int i=0;
cw_aciplist_t aciplist = cw_aciplist_create();
if(!aciplist)
return 0;
for (i=0; i<socklist_len;i++){
if (socklist[i].type != SOCKLIST_UNICAST_SOCKET)
break;
struct sockaddr_storage sa;
unsigned int salen=sizeof(sa);
if ( getsockname(socklist[i].sockfd,(struct sockaddr*)&sa,&salen)<0)
continue;
cw_acip_t * acip;
acip = malloc(sizeof(cw_acip_t));
if (!acip)
continue;
sock_copyaddr(&acip->ip,(struct sockaddr*)&sa);
if (acip->ip.ss_family == AF_INET)
acip->index=11;
else
acip->index=3;
/ * // printf ("Adding IP %s\n",sock_addr2str(&acip->ip));
* /
cw_aciplist_add(aciplist,acip);
}
return aciplist;
}
*/
/*
void * get_iplist(void * arg)
{
return get_aciplist();
}
*/
void release_iplist(void *arg,void *data)
{
}
/*
int handle_echo_req(struct conn *conn, struct cw_action_in *a, uint8_t * data,
int len, struct sockaddr *from)
{
cw_dbg(DBG_X,"Handle Echo Request %p",conn->data);
// struct wtpman * wtpman = conn->data;
// wtpman_echo_req(wtpman);
return 0;
}
*/
/*static void setup_actions (struct mod_ac *c, struct mod_ac *b, struct cw_actiondef *actions)
{
cw_dbg(DBG_X,"Setup Actions! Yea");
cw_set_msg_end_callback(actions,CW_STATE_RUN,CW_MSG_ECHO_REQUEST,handle_echo_req);
}
*/
struct cw_DiscoveryCache * discovery_cache;
int ac_global_init()
{
/* initialize discovery cache */
discovery_cache = discovery_cache_create(100);
if (discovery_cache==NULL)
goto errX;
return 1;
errX:
return 0;
}

View File

@ -1,103 +0,0 @@
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#include <sys/socket.h>
#include "cw/sock.h"
#include "socklist.h"
#include "conf.h"
#include "cw/capwap.h"
/*//#include "cw/capwap_80211.h"*/
/*#include "cw/aciplist.h"*/
/*
int pr(void *x,void *y){
}
*/
/*
struct radioinfo * get_radioinfo()
{
}
*/
/*
struct ac_info * get_acinfo()
{
struct ac_info * acinfo;
acinfo = malloc(sizeof(struct ac_info));
if(!acinfo)
return 0;
memset(acinfo,0,sizeof(struct ac_info));
acinfo->ac_name=conf_acname;
acinfo->stations=10;
acinfo->limit=10000;
acinfo->active_wtps=10;
acinfo->max_wtps=conf_max_wtps;
acinfo->rmac=1;
acinfo->vendor_id=conf_vendor_id;
acinfo->hardware_version=(uint8_t*)conf_hardware_version;
acinfo->software_version=(uint8_t*)conf_software_version;
acinfo->cisco_hardware_version=(uint8_t*)conf_cisco_hardware_version;
acinfo->cisco_software_version=(uint8_t*)conf_cisco_software_version;
if (conf_dtls_psk)
acinfo->security|=AC_SECURITY_S;
if (conf_sslkeyfilename && conf_sslcertfilename)
acinfo->security|=AC_SECURITY_X;
// acinfo->dtls_policy = AC_DTLS_POLICY_C | AC_DTLS_POLICY_D ;
// acinfo->ac_ips = conf_ac_ips;
// acinfo->ac_ips_len=conf_ac_ips_len;
// acinfo->salist=conf_salist;
// acinfo->salist_len=conf_salist_len;
// acinfo->salist = conf_ac_ips;
// acinfo->salist_len = conf_ac_ips_len;
//acinfo->aciplist=get_aciplist();
aciplist_foreach(acinfo->aciplist,pr,NULL);
*/
/*
int i;
for (i=1; i<=4; i++){
acinfo->radioinfos[i].type=
CW_80211_RADIO_TYPE_B |
CW_80211_RADIO_TYPE_A |
CW_80211_RADIO_TYPE_G |
CW_80211_RADIO_TYPE_N;
// acinfo->radioinfos[i].type=0xffffffff;
acinfo->radioinfos[i].rid=i;
}
return acinfo;
}
*/
/*
get_join_result()
{
return 0;
}
*/

View File

@ -33,7 +33,6 @@
#include "socklist.h"
#include "db.h"
#include "cw/capwap_crypto.h"
@ -46,24 +45,41 @@
#include "dataman.h"
#include "cw/cfg.h"
int ac_run();
static void *alive_thread (void *data)
{
/* Ping the database every 5 seconds */
while (1) {
sleep (5);
db_ping();
}
return NULL;
}
int ac_run(cw_Cfg_t * cfg);
#include "statemachine.h"
#include <getopt.h>
#include <sys/socket.h>
#include <sys/un.h>
/*
void tshell_run(int fd)
{
int rc;
printf("listening\n");
rc = listen(fd,5);
printf("listen returned %d\n",rc);
clientsock = accept (sockfd, (struct sockaddr*) &client, &client_size);
}
void tshell()
{
printf("tshell start\n");
struct sockaddr_un addr;
int fd = socket(AF_UNIX, SOCK_STREAM, 0);
memset(&addr, 0, sizeof(addr));
addr.sun_family = AF_UNIX;
strncpy(addr.sun_path, "./tsocket", sizeof(addr.sun_path)-1);
bind(fd, (struct sockaddr*)&addr, sizeof(addr));
while(1);
}
*/
struct bootcfg {
const char * cfgfilename;
@ -74,9 +90,9 @@ static int parse_args (int argc, char *argv[], struct bootcfg * bootcfg)
int c;
opterr = 1;
bootcfg->cfgfilename = "config.ktv";
bootcfg->cfgfilename = "config.ckv";
while ( (c = getopt (argc, argv, "vc:d:p:")) != -1) {
while ( (c = getopt (argc, argv, "hvc:d:p:")) != -1) {
switch (c) {
case 'c':
@ -87,12 +103,18 @@ static int parse_args (int argc, char *argv[], struct bootcfg * bootcfg)
exit(EXIT_SUCCESS);
break;
case 'd':{
int b = cw_strlist_get_id(cw_dbg_strings, optarg);
if (!cw_dbg_set_level_from_str(optarg)){
fprintf(stderr,"Invalid debug option: %s\n",optarg);
exit(EXIT_FAILURE);
}
/* int b = cw_strlist_get_id(cw_dbg_strings, optarg);
if (b==-1){
fprintf(stderr,"Invalid debug option: %s\n",optarg);
exit(EXIT_FAILURE);
}
cw_dbg_set_level(b, 1);
cw_dbg_set_level(b, 1);*/
break;
}
@ -113,7 +135,20 @@ static int parse_args (int argc, char *argv[], struct bootcfg * bootcfg)
struct cw_DiscoveryCache * discovery_cache;
int ac_global_init()
{
/* initialize discovery cache */
discovery_cache = discovery_cache_create(100);
if (discovery_cache==NULL)
goto errX;
return 1;
errX:
return 0;
}
@ -133,194 +168,97 @@ extern struct cw_Mod * cw_get_mod_ac (const char *name);
extern void test_sets();
#include "cw/file.h"
#include "cw/ktv.h"
#include "cw/val.h"
struct mykv {
int key;
int value;
};
int mycmp (void *e1, void *e2)
{
struct mykv * k1 = e1;
struct mykv * k2 = e2;
/*//printf("My CMP: %d and %d\n", k1->key, k2->key);
*/
if (k1->key > k2->key)
return 1;
if (k1->key < k2->key)
return -1;
return 0;
}
void mavl_walk (struct mavlnode * node)
{
struct mykv * kv;
if (!node) {
printf ("\n");
return;
}
kv = mavlnode_dataptr (node);
printf ("KV %d\n", kv->key);
printf ("go left:");
mavl_walk (node->left);
printf ("go right:");
mavl_walk (node->right);
}
/*
int stcmp (const void * sa1, const void *sa2)
{
const char **s1 = sa1;
const char **s2 = sa2;
int rc;
rc = strcmp (*s1, *s2);
printf ("CMP %s, %s = %d\n", *s1, *s2, rc);
return rc;
}
*/
/*
static int ibcmp(const void *v1, const void *v2)
{
int *i1,*i2;
i1=v1;i2=v2;
return *i1-*i2;
}
*/
#include "discovery_cache.h"
void tester1()
{
struct cw_DiscoveryCache * cache;
struct sockaddr_storage addr;
int rc;
const char *c,*b;
cache = discovery_cache_create(1);
sock_strtoaddr("192.168.0.12:1234",(struct sockaddr*)&addr);
discovery_cache_add(cache,(struct sockaddr*)&addr,"Nase","Loeffel");
/*
{
cw_Cfg_t * cfg;
cfg=cw_cfg_create();
char *val;
sock_strtoaddr("192.168.0.13:1234",(struct sockaddr*)&addr);
discovery_cache_add(cache,(struct sockaddr*)&addr,"Nase","Loeffel");
cw_cfg_load("tube.akv",cfg);
// cw_cfg_set(cfg,"cisco/tube","99");
// cw_cfg_set(cfg,"Hello","30");
rc = discovery_cache_get(cache,(struct sockaddr*)&addr,&c,&b);
if (rc) {
printf("RC: %d, %s %s\n",rc,c,b);
cw_cfg_dump(cfg);
val = cw_cfg_get(cfg,"birth");
if (val){
printf("Birts: %s\n",val);
}
mavl_destroy(cfg);
}
}
cw_Val_t x;
CW_TYPE_STR->from_str(&x,"hallo");
x.type->del(&x);
return 0;
*/
static cw_Cfg_t * global_cfg = NULL;
int main (int argc, char *argv[])
{
int rc = 0;
struct bootcfg bootcfg;
FILE * file;
mavl_t types_tree, global_cfg;
const cw_Type_t **ti;
/* parse arguments */
parse_args (argc, argv, &bootcfg);
/* open config file */
file = fopen(bootcfg.cfgfilename,"r");
if (file == NULL){
cw_log(LOG_ERR,"Cant open config file '%s': %s",
bootcfg.cfgfilename, strerror(errno));
exit(EXIT_FAILURE);
}
/* create types tree with default types */
types_tree = cw_ktv_create_types_tree();
for (ti=CW_KTV_STD_TYPES;*ti;ti++){
mavl_add_ptr(types_tree,*ti);
global_cfg=cw_cfg_create();
if (!global_cfg){
fprintf(stderr,"Can't create global_cfg: %s\n",strerror(errno));
goto errX;
}
global_cfg = cw_ktv_create();
if (global_cfg == NULL){
cw_log(LOG_ERR,"Can't create local_cfg: %s",strerror(errno));
exit(EXIT_FAILURE);
}
rc = cw_cfg_load(bootcfg.cfgfilename,global_cfg);
if (rc)
{
if (rc)
fprintf(stderr,"Can't load cfg '%s': %s\n",bootcfg.cfgfilename,strerror(errno));
goto errX;
};
cw_ktv_read_file(file,global_cfg,types_tree);
fclose(file);
actube_global_cfg = global_cfg;
/* cw_dbg_opt_level=0xffffffff;*/
cw_dbg(DBG_INFO,"Hello world");
cw_dbg_ktv_dump(global_cfg,DBG_INFO,NULL,"CFG:",NULL);
/* int idx;
idx = cw_ktv_idx_get(global_cfg,"capwap-control-ip-address/address",0,CW_TYPE_IPADDRESS);
printf("IDX: %d\n");
exit(0);
*/
cw_log_name = "AC-Tube";
if (!read_config ("ac.conf"))
return 1;
start_shell();
/* Show debug options if there are any set */
if (cw_dbg_opt_level)
cw_log (LOG_INFO, "Debug Options: %08X", cw_dbg_opt_level);
/* XXX Hard coded debug settigns, set it by config in the future */
cw_dbg_opt_display = DBG_DISP_ASC_DMP | DBG_DISP_COLORS;
/* Warn, if the "secret" debugging feature for
developers is turned on ;) */
/*
// DBGX("Attention! %s", "DBG X is ON!");
// cw_mod_set_mod_path("../../lib/actube");
//cw_mod_load("capwap");
*/
{
int rc;
cw_Cfg_t * cfg = global_cfg;
struct cw_Cfg_entry e, *result;
e.key="hi";
rc = cw_cfg_base_exists(cfg,"ac-descriptor");
if (!rc ){
printf("No!\n");
return 0;
}
printf("RESULT: %d\n",rc);
cw_cfg_set(tcfg,"tube.0","hallo");
cw_cfg_set(tcfg,"tube.1","welt");
cw_cfg_set(tcfg,"tube.2","der guten laune");
cw_cfg_dump(tcfg);
printf("Next Index: %d\n",cw_cfg_get_next_index(tcfg,"kinder"));
exit(0);
}
*/
/* Initialize the database */
if (!db_init())
goto errX;
/* Start the database */
if (!db_start())
goto errX;
db_ping();
/* Start a database "pinger thread", which inserts
every xx seconds a timestamp into the DB */
pthread_t alth;
pthread_create (&alth, NULL, alive_thread, NULL);
/* Init DTLS library */
dtls_init();
@ -328,18 +266,33 @@ start_shell();
if (!socklist_init())
goto errX;
if (!wtplist_init())
goto errX;
if (!dataman_list_init())
goto errX;
ac_conf_init(global_cfg);
if (!start_rpc(global_cfg))
goto errX;
// cw_cfg_dump(global_cfg);
cw_log (LOG_INFO, "Starting AC-Tube, Name=%s, ID=%s", conf_acname, conf_acid);
rc = ac_run();
cw_log (LOG_INFO, "Starting AC-Tube, Name=%s, ID=%s", cw_cfg_get(global_cfg,"capwap/ac-name",NULL), conf_acid);
rc = ac_run(global_cfg);
errX:
/* XXX There is more cleanup to do */
if (global_cfg)
cw_cfg_destroy(global_cfg);
if (discovery_cache)
discovery_cache_destroy(discovery_cache);
wtplist_destroy();
socklist_destroy();
return rc;
@ -348,45 +301,52 @@ errX:
void process_ctrl_packet (int index, struct sockaddr *addr, uint8_t * buffer, int len);
void process_cw_data_packet (int index, struct sockaddr *addr, uint8_t * buffer, int len);
int ac_run()
{
if (!conf_listen_addrs_len) {
cw_log (LOG_ERR, "Fatal error: No listen addresses found.");
return 1;
}
int ac_run(cw_Cfg_t * cfg)
{
struct cw_Cfg_iter cfi;
const char *s;
struct cw_Cfg_entry *e;
int i;
/* it is important to create the unicast sockets first,
* because when we create the mcast an bcast sockets next
* we will look for already created sockets to find a
* good unicast reply socket */
int i;
for (i = 0; i < conf_listen_addrs_len; i++) {
cw_cfg_iter_init(cfg, &cfi, "actube/listen");
for (i=0; (e = cw_cfg_iter_next(&cfi, NULL)) != NULL; i++) {
char addr[100];
char port[50];
int proto;
s=e->val;
conf_parse_listen_addr (conf_listen_addrs[i], addr, port, &proto);
socklist_add_unicast (addr, port, proto);
conf_parse_listen_addr (s, addr, port, &proto);
socklist_add_unicast (addr, port, proto,
cw_cfg_get_bool(cfg,"actube/ipv4",1),
cw_cfg_get_bool(cfg,"actube/ipv6",1)
);
}
if (!i) {
cw_log (LOG_ERR, "Fatal error: No listen addresses found.");
return 1;
}
if (socklist_len == 0) {
cw_log (LOG_ERR, "Fatal error: Could not setup any listen socket");
return 1;
}
/* create multicast sockets */
for (i = 0; i < conf_mcast_groups_len; i++) {
@ -404,13 +364,21 @@ int ac_run()
}
/* broadcast socket ipv4 only */
for (i = 0; i < conf_bcast_addrs_len; i++) {
//mavl_print(cfg,pcb,180);
cw_cfg_iter_init(cfg, &cfi, "actube/bcast");
for (i=0; (e = cw_cfg_iter_next(&cfi, NULL)) != NULL; i++) {
// for (i = 0; i < conf_bcast_addrs_len; i++) {
char addr[50], port[50];
int proto;
conf_parse_listen_addr (conf_bcast_addrs[i], addr, port, &proto);
s=e->val;
conf_parse_listen_addr (s, addr, port, &proto);
socklist_add_broadcast (addr, port, proto);
#ifdef WITH_LWAPP
// printf("Adding %d\n",socklist_len);
@ -526,7 +494,7 @@ void process_cw_data_packet (int index, struct sockaddr *addr, uint8_t * buffer,
dataman_list_unlock();
dataman_add_packet (dm, buffer, len);
//dataman_add_packet (dm, buffer, len);
return;
@ -570,7 +538,7 @@ void process_cw_ctrl_packet (int index, struct sockaddr *addr, uint8_t * buffer,
if (!wtpman) {
wtpman = wtpman_create (index, addr, preamble & 0xf);
wtpman = wtpman_create (index, addr, preamble & 0xf, global_cfg);
if (!wtpman) {
@ -590,7 +558,8 @@ void process_cw_ctrl_packet (int index, struct sockaddr *addr, uint8_t * buffer,
wtpman_start (wtpman, preamble & 0xf);
}
//printf("Got Packet with len: %d\n",len);
wtpman_addpacket (wtpman, buffer, len);
wtplist_unlock();
}

View File

@ -1,81 +0,0 @@
#!/usr/bin/php
<?php
$sqlfile="./ac.sqlite3";
if (!file_exists($sqlfile))
die ("Can't open $sqlfile\n");
class DB extends SQLite3
{
function __construct()
{
global $sqlfile;
$this->open($sqlfile);
}
}
$db = new DB();
function ls_acs()
{
global $db;
echo "List of ACs\n";
echo "===========\n";
$results = $db->query("SELECT
acid as id,
acname as name,
lastseen>datetime('now','-10 second') as active
FROM acs ORDER by active,id,name;"
);
while ($row = $results->fetchArray(SQLITE3_ASSOC)) {
$o = $row['active'] ? "yes" : "no";
echo "ID: $row[id], Name: $row[name] - Online: $o\n";
}
}
function ls_wtps()
{
global $db;
echo "List of WTPs\n";
echo "============\n";
$result = $db->query("SELECT
wtpid as wtpid,
wtps.acid as acid,
acs.acname as acname
FROM wtps
LEFT join acs USING(acid)
");
while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
$j = $row['acid'] ? "Joined to $row[acid]" : "Not joined";
echo "ID: $row[wtpid], $j\n";
}
}
function print_help()
{
echo "acshell <cmd>\n";
echo "\n";
echo "acshell lsacs - list acs\n";
echo "acshell lswtp - list wtps\n";
}
//ls_wtps();
//
//var_dump($argv);
if (count($argv)==1){
print_help();
exit(0);
}
if( $argv[1] == "lsacs" )
ls_acs();
if( $argv[1] == "lswtps" )
ls_wtps();

401
src/ac/act.c Normal file
View File

@ -0,0 +1,401 @@
/* $NetBSD: tc1.c,v 1.7 2016/02/17 19:47:49 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* Christos Zoulas of Cornell University.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
/*
* test.c: A little test program
*/
#include <sys/wait.h>
#include <ctype.h>
#include <dirent.h>
#include <locale.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <errno.h>
#include "histedit.h"
#include "cw/cfg.h"
#include "cw/sock.h"
static int continuation = 0;
volatile sig_atomic_t gotsig = 0;
static unsigned char complete(EditLine *, int);
static char *prompt(EditLine *);
static void sig(int);
FILE * act_f;
static int
get_result(FILE *f, char *str,int len)
{
int n = len;
char *rc;
rc = fgets (str, len, f);
if (rc==NULL)
return 0;
n = strlen(str);
if (n==1 && str[0]=='\n')
return 0;
return 1;
}
static char *
prompt(EditLine *el )
{
static char str[64];
char str2[64];
int rc;
fprintf(act_f,"@prompt\n");
rc = get_result(act_f,str,64);
while(rc){
rc=get_result(act_f,str2,64);
}
return (continuation ? "> " : str);
}
static void
sig(int i)
{
gotsig = i;
}
static unsigned char
complete(EditLine *el, int ch __attribute__((__unused__)))
{
DIR *dd = opendir(".");
struct dirent *dp;
const char* ptr;
const LineInfo *lf = el_line(el);
size_t len;
int res = CC_ERROR;
/*
* Find the last word
*/
for (ptr = lf->cursor - 1;
!isspace((unsigned char)*ptr) && ptr > lf->buffer; ptr--)
continue;
len = lf->cursor - ++ptr;
for (dp = readdir(dd); dp != NULL; dp = readdir(dd)) {
if (len > strlen(dp->d_name))
continue;
if (strncmp(dp->d_name, ptr, len) == 0) {
if (el_insertstr(el, &dp->d_name[len]) == -1)
res = CC_ERROR;
else
res = CC_REFRESH;
break;
}
}
closedir(dd);
return res;
}
const char *cfgfilename = "config.ckv";
const char *srvaddr;
const char *prgname;
static int
parse_args (int argc, char *argv[])
{
int c;
opterr = 1;
while ( (c = getopt (argc, argv, "hvc:s:")) != -1) {
switch (c) {
case 'c':
cfgfilename = optarg;
break;
case 'v':
printf("ACT shell for ACTube version 0.0.1, %s\n", SYS_ARCH);
exit(EXIT_SUCCESS);
break;
case 's':
srvaddr = optarg;
break;
/* case 'd':{
if (!cw_dbg_set_level_from_str(optarg)){
fprintf(stderr,"Invalid debug option: %s\n",optarg);
exit(EXIT_FAILURE);
}
break;
} */
case '?':
exit(EXIT_FAILURE);
default:
case 'h':
printf("Usage:\n");
printf("%s [-v | -h | -s <dst> | -c <cfg> ]\n",argv[0]);
printf(" -c: specify config file\n");
printf(" -s: specify adress to connect to \n");
printf(" -v: print version info\n");
exit(EXIT_SUCCESS);
break;
}
}
return 0;
}
int create_tcp_fd(const char *addr)
{
struct sockaddr server;
int rc;
int sockfd;
memset(&server,0,sizeof(server));
rc = sock_strtoaddr (addr, (struct sockaddr*) &server);
if (! rc) {
fprintf(stderr, "Can't parse address '%s', %s\n", addr, strerror (errno));
return -1;
}
sockfd = socket ( ( (struct sockaddr*) &server)->sa_family, SOCK_STREAM, 0);
rc = connect(sockfd, (struct sockaddr*)&server, sizeof(server));
if (rc ) {
fprintf(stderr,"%s: Error, can't connt to %s %s\n",prgname,addr,strerror(errno));
return -1;
}
return sockfd;
}
static FILE *act_connect(const char *srvaddr)
{
int fd;
if (srvaddr==NULL){
fprintf(stderr,"%s: Error, no address given.\n",prgname);
return NULL;
}
fd=create_tcp_fd(srvaddr);
if (fd==-1)
return NULL;
return fdopen(fd,"a+");
// return NULL;
}
int
main(int argc , char *argv[])
{
prgname = argv[0];
parse_args(argc,argv);
act_f = act_connect(srvaddr);
if (act_f==NULL){
return (EXIT_FAILURE);
}
EditLine *el = NULL;
int num;
const char *buf;
Tokenizer *tok;
#if 0
int lastevent = 0;
#endif
int ncontinuation;
History *hist;
HistEvent ev;
(void) setlocale(LC_CTYPE, "");
(void) signal(SIGINT, sig);
(void) signal(SIGQUIT, sig);
(void) signal(SIGHUP, sig);
(void) signal(SIGTERM, sig);
hist = history_init(); /* Init the builtin history */
/* Remember 100 events */
history(hist, &ev, H_SETSIZE, 100);
tok = tok_init(NULL); /* Initialize the tokenizer */
/* Initialize editline */
el = el_init(*argv, stdin, stdout, stderr);
el_set(el, EL_EDITOR, "emacs"); /* Default editor is vi */
el_set(el, EL_SIGNAL, 0); /* Handle signals gracefully */
el_set(el, EL_PROMPT_ESC, prompt, '\1');/* Set the prompt function */
/* Tell editline to use this history interface */
el_set(el, EL_HIST, history, hist);
/* Add a user-defined function */
el_set(el, EL_ADDFN, "ed-complete", "Complete argument", complete);
/* Bind tab to it */
el_set(el, EL_BIND, "^I", "ed-complete", NULL);
/*
* Bind j, k in vi command mode to previous and next line, instead
* of previous and next history.
*/
el_set(el, EL_BIND, "-a", "k", "ed-prev-line", NULL);
el_set(el, EL_BIND, "-a", "j", "ed-next-line", NULL);
/*
* Source the user's defaults file.
*/
el_source(el, NULL);
while ((buf = el_gets(el, &num)) != NULL && num != 0) {
int ac, cc, co;
const char **av;
const LineInfo *li;
li = el_line(el);
if (gotsig) {
(void) fprintf(stderr, "Got signal %d.\n", (int)gotsig);
gotsig = 0;
el_reset(el);
}
if (!continuation && num == 1)
continue;
ac = cc = co = 0;
ncontinuation = tok_line(tok, li, &ac, &av, &cc, &co);
if (ncontinuation < 0) {
(void) fprintf(stderr, "Internal error\n");
continuation = 0;
continue;
}
/* Simpler */
history(hist, &ev, continuation ? H_APPEND : H_ENTER, buf);
continuation = ncontinuation;
ncontinuation = 0;
if (continuation)
continue;
if (strcmp(av[0], "history") == 0) {
int rv;
switch (ac) {
case 1:
for (rv = history(hist, &ev, H_LAST); rv != -1;
rv = history(hist, &ev, H_PREV))
(void) fprintf(stdout, "%4d %s",
ev.num, ev.str);
break;
case 2:
if (strcmp(av[1], "clear") == 0)
history(hist, &ev, H_CLEAR);
else
goto badhist;
break;
case 3:
if (strcmp(av[1], "load") == 0)
history(hist, &ev, H_LOAD, av[2]);
else if (strcmp(av[1], "save") == 0)
history(hist, &ev, H_SAVE, av[2]);
break;
badhist:
default:
(void) fprintf(stderr,
"Bad history arguments\n");
break;
}
} else if (el_parse(el, ac, av) == -1) {
char str[2000];
int i;
char * sp ="";
str[0]=0;
for (i=0; i<ac; i++){
fprintf(act_f,"%s%s",sp,av[i]);
sp=" ";
}
fprintf(act_f,"\n");
fflush(act_f);
do {
int n;
fgets (str, 2000, act_f);
n = strlen(str);
// printf("LEN: %d\n",n);
if (n==1 && str[0]=='\n')
break;
fprintf(stdout,"%s",str);
}while(!feof(act_f));
fflush(stdout);
}
tok_reset(tok);
}
el_end(el);
tok_end(tok);
history_end(hist);
return (0);
}

View File

@ -15,73 +15,44 @@
along with Foobar. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdlib.h>
#include <string.h>
#include <sys/utsname.h>
#include <confuse.h>
#include "cw/capwap.h"
#include "cw/sock.h"
#include "cw/log.h"
#include "cw/dbg.h"
#include "cw/cw_util.h"
#include "cw/dtls.h"
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
#include <net/if.h>
#include "cw/dbg.h"
#include "cw/cw.h"
#include "cw/cfg.h"
#include "conf.h"
#include "ac.h"
uint8_t conf_macaddress[12];
uint8_t conf_macaddress_len = 0;
long conf_strict_capwap = 1;
long conf_strict_headers = 0;
/*int conf_capwap_mode = CW_MODE_CAPWAP;*/
const char *conf_acname = NULL;
int conf_acname_len = 0;
char *conf_acid = NULL;
char *conf_primary_if = NULL;
long conf_max_wtps = CONF_DEFAULT_MAXWTPS;
char *conf_logfilename = CONF_DEFAULT_LOGFILENAME;
struct sockaddr_storage *conf_salist = NULL;
char **conf_listen_addrs;
int conf_listen_addrs_len = 0;
char **conf_mcast_groups = 0;
int conf_mcast_groups_len = 0;
char **conf_bcast_addrs = 0;
int conf_bcast_addrs_len;
//struct sockaddr_storage *conf_bsalist = NULL;
struct sockaddr_storage *conf_bsalist = NULL;
//int conf_salist_len = 0;
//int conf_bsalist_len = 0;
int conf_salist_len = 0;
int conf_bsalist_len = 0;
//struct sockaddr *conf_ac_ips;
//int conf_ac_ips_len;
struct sockaddr *conf_ac_ips;
int conf_ac_ips_len;
char *conf_sslcertfilename = NULL;
char *conf_sslkeyfilename = NULL;
char *conf_sslkeypass = NULL;
char *conf_sslcipher = NULL;
char *conf_dtls_psk = NULL;
//char *conf_sslcertfilename = NULL;
//char *conf_sslkeyfilename = NULL;
//char *conf_sslkeypass = NULL;
//char *conf_dtls_psk = NULL;
int conf_security = 0;
long conf_vendor_id = CONF_DEFAULT_VENDOR_ID;
@ -119,14 +90,44 @@ char *conf_control_port = 0;
int conf_dtls_verify_peer = 1;
static int init_acname()
static int init_ac_name(cw_Cfg_t * cfg)
{
if (conf_acname == NULL) {
char *s = malloc(strlen(CONF_DEFAULT_ACNAME) + strlen(conf_acid) + 1);
sprintf(s, "%s%s", CONF_DEFAULT_ACNAME, conf_acid);
conf_acname = s;
char *s;
char *primary_if=NULL;
char ac_name[CAPWAP_MAX_AC_NAME_LEN+1];
uint8_t macaddress[128];
uint8_t macaddress_len;
char acid[128];
int i;
s= (char*)cw_cfg_get(cfg,"capwap/ac-name",NULL);
if (s!=NULL)
return 1;
if (!primary_if)
primary_if = sock_get_primary_if(AF_INET);
acid[0]=0;
if (primary_if) {
macaddress_len=8;
if (!sock_getifhwaddr(primary_if, macaddress, &macaddress_len)) {
cw_dbg(DBG_INFO, "Fatal: Unable to detect link layer address for %s\n",
primary_if);
}
else{
s=acid;
for (i = 0; i < macaddress_len; i++) {
s += sprintf(s, "%02X", macaddress[i]);
}
}
free(primary_if);
}
conf_acname_len = strlen(conf_acname);
sprintf(ac_name,"actube%s",acid);
cw_cfg_set(cfg,"capwap/ac-name",ac_name);
return 1;
}
@ -134,165 +135,27 @@ static int init_acname()
static int init_acid()
{
int i;
char *s;
if (conf_acid != NULL)
return 1;
#ifdef WITH_IPV6
conf_primary_if = sock_get_primary_if(AF_INET6);
if (!conf_primary_if)
conf_primary_if = sock_get_primary_if(AF_INET);
#else
conf_primary_if = get_primary_if(AF_INET);
#endif
if (!conf_primary_if) {
cw_log(LOG_ERR,
"Fatal: Unable to detect primary interface, needed to set ac_id. Pleas use confiPleas u to set ac_id");
return 0;
}
if (!sock_getifhwaddr(conf_primary_if, conf_macaddress, &conf_macaddress_len)) {
cw_log(LOG_ERR, "Fatal: Unable to detect link layer address for %s\n",
conf_primary_if);
return 0;
};
conf_acid = malloc(2 * conf_macaddress_len + 1);
s = conf_acid;
for (i = 0; i < conf_macaddress_len; i++) {
s += sprintf(s, "%02X", conf_macaddress[i]);
}
return 1;
}
static int init_dtls()
{
if (conf_dtls_psk != NULL) {
/*
// conf_security=CW_SECURITY_FLAGS_S;
*/
}
return 1;
}
static int init_vendor_id()
{
return 1;
}
/*
static int init_version()
{
// Init hardware version
if (!conf_hardware_version) {
struct utsname u;
int rc = uname(&u);
if (rc < 0)
conf_hardware_version =
(bstr_t) strdup(CONF_DEFAULT_HARDWARE_VERSION);
else {
char str[265];
sprintf(str, "%s / %s %s", u.machine, u.sysname, u.release);
conf_hardware_version = (bstr_t) strdup(str);
}
}
bstr_replace(&conf_hardware_version,
bstr_create_from_cfgstr((char *) conf_hardware_version));
// software version
if (!conf_software_version)
conf_software_version = (bstr_t) strdup(CONF_DEFAULT_SOFTWARE_VERSION);
bstr_replace(&conf_software_version,
bstr_create_from_cfgstr((char *) conf_software_version));
// Cisco hardware version
if (!conf_cisco_hardware_version)
conf_cisco_hardware_version =
(bstr_t) strdup(CONF_DEFAULT_CISCO_HARDWARE_VERSION);
bstr_replace(&conf_cisco_hardware_version,
bstr_create_from_cfgstr((char *) conf_cisco_hardware_version));
return 1;
}
*/
static int init_control_port()
{
char str[30];
sprintf(str, "%d", CONF_DEFAULT_CONTROL_PORT);
conf_control_port =
(char *) cw_setstr((uint8_t **) & conf_control_port, (uint8_t *) str,
strlen(str));
#ifdef WITH_LWAPP
sprintf(str, "%d", CONF_DEFAULT_LW_CONTROL_PORT);
conf_lw_control_port = strdup(str);
#endif
return 1;
}
#include <ifaddrs.h>
static int init_listen_addrs()
static int init_listen_addrs(cw_Cfg_t * cfg)
{
char key[CW_CFG_MAX_KEY_LEN];
struct ifaddrs *ifap, *ifa;
int rc;
int ctr;
if (conf_listen_addrs != 0)
return 1;
struct cw_Cfg_iter cfi;
cw_cfg_iter_init(cfg, &cfi, "actube/listen");
if (cw_cfg_iter_next(&cfi,NULL) != NULL)
return 0;
rc = getifaddrs(&ifap);
if (rc == -1)
return 0;
/* count the addresses */
ctr = 0;
for (ifa = ifap; ifa != 0; ifa = ifa->ifa_next) {
if (!ifa->ifa_addr)
continue;
if (ifa->ifa_addr->sa_family == AF_INET && conf_ipv4)
ctr++;
#ifdef WITH_IPV6
if (ifa->ifa_addr->sa_family == AF_INET6 && conf_ipv6)
ctr++;
#endif
}
conf_listen_addrs = malloc(sizeof(char *) * ctr);
if (!conf_listen_addrs) {
rc = 0;
goto errX;
}
memset(conf_listen_addrs, 0, sizeof(char *) * ctr);
ctr = 0;
/* get the addresses */
for (ifa = ifap; ifa != 0; ifa = ifa->ifa_next) {
@ -310,12 +173,9 @@ static int init_listen_addrs()
if (ifa->ifa_addr->sa_family == AF_INET && conf_ipv4) {
sock_addrtostr(ifa->ifa_addr, str, 100,0);
conf_listen_addrs[ctr] =
(char *) cw_setstr((uint8_t **) & conf_listen_addrs[ctr],
(uint8_t *) str, strlen(str));
if (conf_listen_addrs[ctr])
ctr++;
sprintf(key,"actube/listen.%d",ctr++);
cw_cfg_set(cfg,key,str);
}
if (ifa->ifa_addr->sa_family == AF_INET6 && conf_ipv6) {
sock_addrtostr(ifa->ifa_addr, str, 100,0);
@ -324,16 +184,12 @@ static int init_listen_addrs()
strcat(str, "%");
strcat(str, ifa->ifa_name);
}
conf_listen_addrs[ctr] =
(char *) cw_setstr((uint8_t **) & conf_listen_addrs[ctr],
(uint8_t *) str, strlen(str));
if (conf_listen_addrs[ctr])
ctr++;
sprintf(key,"actube/listen.%d",ctr++);
cw_cfg_set(cfg,key,str);
}
}
conf_listen_addrs_len = ctr;
rc = 1;
errX:
/*errX:*/
freeifaddrs(ifap);
return rc;
}
@ -379,21 +235,27 @@ static int add_bcast_addr(void *priv, void *addr)
/*
* Initialize broadcast addresses (ipv4 only)
*/
int init_bcast_addrs()
int init_bcast_addrs(cw_Cfg_t *cfg)
{
int rc;
char str[100];
char key[100];
struct ifaddrs *ifa0, *ifa;
mavl_t t;
mavliter_t it;
struct cw_Cfg_iter cfi;
int i;
cw_cfg_iter_init(cfg, &cfi, "actube/bcast");
if (cw_cfg_iter_next(&cfi,NULL) != NULL)
return 0;
if (conf_bcast_addrs)
if (!cw_cfg_get_bool(cfg,"actube/ipv4", 1))
return 1;
if (!conf_ipv4)
return 1;
t = mavl_create_str();
/*t = mavl_create_ptr(); */
t = mavl_create_ptr(mavl_cmpstr,mavl_freeptr);
if (t==NULL)
return 0;
@ -427,22 +289,34 @@ int init_bcast_addrs()
if (ifa->ifa_broadaddr) {
char *s; //,*sr;
sock_addrtostr(ifa->ifa_broadaddr, str, 100,1);
*strchr(str, ':') = 0;
mavl_add_str(t, cw_strdup(str));
s = cw_strdup(str);
mavl_add_str(t, s);
// printf("BCAST = %p --- %p: %s\n",str,s,str);
}
}
conf_bcast_addrs = malloc(t->count * sizeof(char *));
// conf_bcast_addrs = malloc(t->count * sizeof(char *));
i=0;
mavliter_init(&it,t);
mavliter_foreach(&it){
char * d;
d = mavliter_get_str(&it);
conf_bcast_addrs[conf_bcast_addrs_len] = cw_strdup(d);
if (conf_bcast_addrs[conf_bcast_addrs_len] != 0)
conf_bcast_addrs_len++;
// conf_bcast_addrs[conf_bcast_addrs_len] = cw_strdup(d);
// if (conf_bcast_addrs[conf_bcast_addrs_len] != 0)
// conf_bcast_addrs_len++;
sprintf(key,"actube/bcast.%d",i++);
cw_cfg_set(cfg,key,d);
}
@ -454,7 +328,7 @@ int init_bcast_addrs()
return 1;
}
int init_mcast_groups()
int init_mcast_groups(cw_Cfg_t * cfg)
{
int ctr;
int i;
@ -508,6 +382,7 @@ int init_mcast_groups()
}
/*
static int conf_read_strings(cfg_t * cfg, char *name, char ***dst, int *len)
{
@ -533,16 +408,9 @@ static int conf_read_strings(cfg_t * cfg, char *name, char ***dst, int *len)
return 1;
}
/*
struct conf_dbg_level_names{
const char *name;
int level;
};
*/
/*
static int conf_read_dbg_level(cfg_t * cfg)
{
const char *name = "dbg";
@ -560,6 +428,7 @@ static int conf_read_dbg_level(cfg_t * cfg)
}
return 1;
}
*/
struct cw_Mod ** conf_mods;
char *conf_mods_dir = NULL;
@ -567,18 +436,26 @@ char *conf_mods_dir = NULL;
/*
* Read the module names from config file
*/
static int conf_read_mods(cfg_t *cfg){
int n, i;
n = cfg_size(cfg,CFG_ENTRY_MODS);
conf_mods = malloc(sizeof(struct cw_Mod *)*(n+1));
static int init_mods(cw_Cfg_t *cfg){
cw_dbg(DBG_INFO,"Mods directory: %s",conf_mods_dir);
cw_mod_set_path(conf_mods_dir);
int i;
struct cw_Cfg_entry *e;
const char * modname;
for (i=0; i < n; i++){
char *modname = cfg_getnstr(cfg, CFG_ENTRY_MODS, i);
struct cw_Mod * mod = cw_mod_load(modname, actube_global_cfg, CW_ROLE_AC);
struct cw_Cfg_iter cfi;
cw_cfg_iter_init(cfg, &cfi, "actube/mod");
if (cw_cfg_iter_next(&cfi,NULL) == NULL){
cw_cfg_set(cfg,"actube/mod.0","capwap");
cw_cfg_set(cfg,"actube/mod.1","capwap80211");
}
// cw_dbg(DBG_INFO,"Mods directory: %s",conf_mods_dir);
// cw_mod_set_path(conf_mods_dir);
cw_cfg_iter_init(cfg, &cfi, "actube/mod");
for (i=0; (e = cw_cfg_iter_next(&cfi, NULL)) != NULL; i++) {
modname = e->val;
struct cw_Mod * mod = cw_mod_load(modname, cfg, CW_ROLE_AC);
if (!mod)
return 0;
@ -587,24 +464,6 @@ static int conf_read_mods(cfg_t *cfg){
return 1;
}
/*
void conf_init_capwap_mode()
{
if (conf_capwap_mode_str == NULL)
return;
if (0 == strcmp(conf_capwap_mode_str, "cipwap")) {
conf_capwap_mode = CW_MODE_CIPWAP;
}
if (0 == strcmp(conf_capwap_mode_str, "capwap")) {
conf_capwap_mode = CW_MODE_CAPWAP;
}
}
*/
int conf_parse_listen_addr(const char *addrstr, char *saddr, char *port, int *proto)
{
@ -686,159 +545,12 @@ int conf_parse_listen_addr(const char *addrstr, char *saddr, char *port, int *pr
return 0;
}
static void errfunc(cfg_t *cfg, const char *fmt, va_list ap){
if (cfg && cfg->filename && cfg->line)
fprintf(stderr, "ERROR in %s:%d: ",
cfg->filename, cfg->line);
else if (cfg && cfg->filename)
fprintf(stderr, "ERROR in %s:", cfg->filename);
vfprintf(stderr, fmt, ap);
fprintf(stderr,"\n");
}
int read_config(const char *filename)
void ac_conf_init(cw_Cfg_t *cfg)
{
int i, n;
cfg_opt_t opts[] = {
CFG_STR_LIST("mods", "{}", CFGF_NONE),
CFG_SIMPLE_STR("mods_dir", &conf_mods_dir),
CFG_STR_LIST("dbg", "{}", CFGF_NONE),
CFG_STR_LIST("listen", "{}", CFGF_NONE),
CFG_STR_LIST("mcast_groups", "{}", CFGF_NONE),
CFG_STR_LIST("broadcast_listen", "{}", CFGF_NONE),
CFG_STR_LIST("ac_ips", "{}", CFGF_NONE),
CFG_SIMPLE_STR("control_port", &conf_control_port),
CFG_SIMPLE_BOOL("strict_capwap", &conf_strict_capwap),
CFG_SIMPLE_BOOL("strict_headers", &conf_strict_headers),
CFG_SIMPLE_BOOL("use_loopback", &conf_use_loopback),
/*// CFG_SIMPLE_STR("capwap_mode", &conf_capwap_mode_str),*/
#ifdef WITH_LWAPP
CFG_SIMPLE_STR("lw_control_port", &conf_lw_control_port),
CFG_SIMPLE_BOOL("lwapp", &conf_lwapp),
#endif
CFG_SIMPLE_INT("max_wtps", &conf_max_wtps),
CFG_SIMPLE_INT("debug_level", &conf_debug_level),
CFG_SIMPLE_INT("vendor_id", &conf_vendor_id),
CFG_SIMPLE_STR("ac_id", &conf_acid),
CFG_SIMPLE_STR("ac_name", &conf_acname),
CFG_SIMPLE_STR("hardware_version", &conf_hardware_version),
CFG_SIMPLE_STR("software_version", &conf_software_version),
CFG_SIMPLE_STR("cisco_hardware_version", &conf_cisco_hardware_version),
CFG_SIMPLE_STR("cisco_software_version", &conf_cisco_software_version),
CFG_SIMPLE_STR("ssl_cert", &conf_sslcertfilename),
CFG_SIMPLE_STR("ssl_key", &conf_sslkeyfilename),
CFG_SIMPLE_STR("ssl_key_pass", &conf_sslkeypass),
CFG_SIMPLE_STR("ssl_cipher", &conf_sslcipher),
CFG_SIMPLE_STR("dtls_psk", &conf_dtls_psk),
CFG_SIMPLE_BOOL("dtls_verify_peer", &conf_dtls_verify_peer),
CFG_SIMPLE_BOOL("ipv4", &conf_ipv4),
CFG_SIMPLE_BOOL("ipv6", &conf_ipv6),
CFG_SIMPLE_STR("db_file", &conf_db_file),
CFG_SIMPLE_STR("image_dir", &conf_image_dir),
CFG_END()
};
cfg_t *cfg;
conf_mods_dir=cw_strdup("");
if (!init_control_port())
return 0;
cfg = cfg_init(opts, CFGF_NONE);
cfg_set_error_function(cfg, errfunc);
if (cfg_parse(cfg, filename))
return 0;
/* read debug options */
conf_read_dbg_level(cfg);
/* read the listen addresses */
conf_read_strings(cfg, "listen", &conf_listen_addrs, &conf_listen_addrs_len);
/* read multi cast groups */
conf_read_strings(cfg, "mcast_groups", &conf_mcast_groups,
&conf_mcast_groups_len);
/* read ipv4 broadcast addresses */
conf_read_strings(cfg, "broadcast_listen", &conf_bcast_addrs, &conf_bcast_addrs_len);
/* read ac_ips */
n = cfg_size(cfg, "ac_ips");
if (!(conf_ac_ips = malloc(sizeof(struct sockaddr) * n)))
return 0;
conf_ac_ips_len = n;
for (i = 0; i < n; i++) {
struct sockaddr sa;
char *str = cfg_getnstr(cfg, "ac_ips", i);
if (sock_strtoaddr(cfg_getnstr(cfg, "ac_ips", i), &sa))
conf_ac_ips[i] = sa;
else {
perror(str);
}
}
if (!conf_read_mods(cfg)){
cfg_free(cfg);
return 0;
}
cfg_free(cfg);
if (!init_acid())
return 0;
if (!init_acname())
return 0;
/* if (!init_version())
return 0;
*/
if (!init_vendor_id())
return 0;
if (!init_dtls())
return 0;
if (!conf_sslcipher)
conf_sslcipher = CAPWAP_CIPHER;
if (!conf_image_dir)
conf_image_dir = CONF_DEFAULT_IMAGE_DIR;
init_listen_addrs();
init_mcast_groups();
init_bcast_addrs();
return 1;
}
void free_config()
{
init_listen_addrs(cfg);
init_bcast_addrs(cfg);
init_ac_name(cfg);
init_mods(cfg);
}

View File

@ -21,7 +21,6 @@
#include <stdio.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <confuse.h>
#include <sys/ioctl.h>
#include <net/if.h>
@ -31,7 +30,7 @@
#include "cw/bstr.h"
#include "cw/mod.h"
#include "cw/vendors.h"
#include "cw/cfg.h"
extern struct cw_Mod ** conf_mods;
@ -94,8 +93,6 @@ extern bstr_t conf_cisco_software_version;
extern char **conf_listen_addrs;
extern int conf_listen_addrs_len;
extern struct sockaddr *conf_ac_ips;
extern int conf_ac_ips_len;
@ -115,7 +112,7 @@ extern char *conf_sslkeyfilename;
extern char *conf_sslkeypass;
extern char *conf_dtls_psk;
extern int conf_dtls_verify_peer;
char *conf_sslcipher;
extern char *conf_sslcipher;
extern char *conf_image_dir;
@ -141,5 +138,8 @@ extern int conf_parse_listen_addr(const char *addr, char *saddr, char *port, int
#define CFG_ENTRY_MODS "mods"
#define CONF_PREFIX "actube"
void ac_conf_init(cw_Cfg_t *cfg);
#endif

75
src/ac/config.ckv Normal file
View File

@ -0,0 +1,75 @@
#Cfg
#
# AC Name
# Deafults to actube + mac address of primary interface
#
#capwap/ac-name
#
capwap/ac-name: actube_X
capwap/ssl-cipher: DHE-RSA:RSA:AES-256-CBC:AES-128-CBC:SHA1:PSK
capwap/ssl-psk-enable: false
capwap/ssl-psk: 123456
capwap/ssl-dhbits: 1024
capwap/ssl-keyfile: "../../ssl/intermediate-ca/int-ca.key"
capwap/ssl-certfile: "../../ssl/intermediate-ca/int-ca.crt"
cisco/ssl-keyfile: "../../ssl/intermediate-ca/int-ca.key"
cisco/ssl-certfile: "../../ssl/intermediate-ca/int-ca.crt"
cisco/ssl-cipher: DEFAULT
cisco/ssl-dhbits: 2048
#
# Whether or not to use IPv4/IPv6
#
#actube/ipv4: true
#actube/ipv6: true
#
actube/ipv6: false
#
# List of Mods
#
#actube/mod.1: capwap
#actube/mod.2: capwap80211
#
actube/mod.0: cisco
actube/mod.1: capwap
actube/mod.2: capwap80211
#actube/rpc/listen: unix:/tmp/actube
actube/rpc/listen: tcp:127.0.0.1:5000
actube/rpc/enable: true
capwap/ac-descriptor/dtls-policy: 1
capwap/ac-descriptor/hardware/vendor: 4232704
capwap/ac-descriptor/hardware/version: .x01000001
capwap/ac-descriptor/max-wtps : 200
capwap/ac-descriptor/active-wtps: 2
capwap/ac-descriptor/r-mac-field: 1
cawpap/ac-descriptor/reserved1 : 0
capwap/ac-descriptor/security : 2
capwap/ac-descriptor/software/vendor : 0
capwap/ac-descriptor/software/version: v0.0.1
capwap/ac-descriptor/station-limit: 1000
capwap/ac-descriptor/stations: 0
capwap/control-ip-address/address.0: 192.168.0.24
#
# CAPWAP Timers
#
capwap/timers/change-state-pending-timer: Word: 3
capwap/timers/data-check-timer: Word: 10
capwap/timers/echo-interval :Byte: 30
capwap/timers/max-discovery-interval :Byte: 10

View File

@ -29,7 +29,7 @@ ac-descriptor/software/vendor :Dword: 4232704
ac-descriptor/software/version :Bstr16: .x07036500
ac-descriptor/station-limit :Word: 1000
ac-descriptor/stations :Word: 0
capwap-control-ip-address/address.0 :IPAddress: 192.168.0.29
capwap-control-ip-address/address.0 :IPAddress: 192.168.0.14
#capwap-control-ip-address/address.0 :IPAddress: 192.168.42.51
capwap-control-ip-address/wtps.0 :Word: 2
cisco/mwar-type :Byte: 0
@ -37,24 +37,28 @@ maximum-message-length :Word: 4096
radio/0/wtp-radio-information :Dword: 7
result-code :Dword: 0
cisco/ap-telnet-ssh/ssh :Bool: true
cisco/ap-telnet-ssh/telnet :Bool: true
ac-name:Bstr16:"X1"
#capwap-control-ip-address/address.0:IPAddress:1192.168.0.14
capwap-control-ip-address/address.0:IPAddress:192.168.0.29
capwap-control-ip-address/address.0:IPAddress:192.168.0.14
#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/wtps.0:Word:0
#capwap-control-ip-address/wtps.1:Word:11
#cisco/ssl-keyfile:Str:"../../ssl/certs/ac.key"
#cisco/ssl-certfile:Str:"../../ssl/certs/ac.crt"
#cisco/ssl-keyfile:Str:"../../ssl/certs/ac-cisco.key"
#cisco/ssl-certfile:Str:"../../ssl/certs/ac-cisco.pem"
#cisco/ssl-keyfile:Str:"../../ssl/certs/int-ca.key"
#cisco/ssl-certfile:Str:"../../ssl/certs/int-ca.crt"
cisco/ssl-keyfile:Str:"../../ssl/intermediate-ca/int-ca.key"
cisco/ssl-certfile:Str:"../../ssl/intermediate-ca/int-ca.crt"
#cisco/ssl-keyfile:Str:"../../ssl/intermediate-ca/cisco-ac-int-ca.key"
#cisco/ssl-certfile:Str:"../../ssl/intermediate-ca/cisco-ac-int-ca.crt"
cisco/ssl-cipher:Str:DEFAULT:!ECDH
#cisco/ssl-cipher:Str:+DHE-RSA:+AES-256-CBC:+AES-128-CBC:+SHA1
cisco/ssl-dhbits:Word:2048
@ -107,7 +111,7 @@ radio.1/cisco/multi-domain-capability/max-tx-power-level :Word: 20
radio.1/cisco/multi-domain-capability/number-of-channels :Word: 4
radio.1/cisco/multi-domain-capability/reserved :Byte: 1
radio.1/cisco/wtp-radio-config/beacon-period :Word: 100
radio.1/cisco/wtp-radio-config/bss-id :Bstr16: .x04fe7f499b90
radio.1/cisco/wtp-radio-config/bss-id :Bstr16: .x05fe7f499b90
radio.1/cisco/wtp-radio-config/cfg-period :Byte: 4
radio.1/cisco/wtp-radio-config/cfg-type :Byte: 1
radio.1/cisco/wtp-radio-config/cfp-maximum-duration :Word: 60

View File

@ -1,6 +1,6 @@
#include <stdlib.h>
#include "cw/mavl.h"
#include "mavl.h"
#include "cw/sock.h"
#include "cw/timer.h"
#include "cw/cw.h"
@ -86,7 +86,7 @@ struct dataman *dataman_list_add(struct dataman *dm)
{
cw_dbg(DBG_X,"Adding dataman %p\n",dm);
return mavl_add(dataman_list, dm,NULL);
return mavl_insert(dataman_list, dm,NULL);
}
@ -114,8 +114,10 @@ int dataman_process_keep_alive(struct netconn *nc, uint8_t *rawmsg, int len)
((uint16_t*)sessid)[0]=sessid_len;
memcpy(bstr16_data(sessid),cw_get_elem_data(elem),sessid_len);
struct wtpman * wtpman = wtplist_get_by_session_id(sessid);
stop();
struct wtpman * wtpman =NULL;
// struct wtpman * wtpman = wtplist_get_by_session_id(sessid);
if (wtpman){
if (!dm->wtpman)
dm->wtpman=wtpman;

View File

@ -1,7 +1,7 @@
#ifndef CW_MAVL_H
#define CW_MAVL_H
#include "cw/mavl.h"
#include "mavl.h"
extern void db_ping();
extern void db_ping_wtp(const char *wtpid,const char *acid);

View File

@ -2,8 +2,9 @@
#include "cw/sock.h"
#include "cw/mlist.h"
#include "cw/mavl.h"
#include "mavl.h"
#include "cw/mod.h"
#include "cw/dbg.h"
#include "discovery_cache.h"
struct cw_DiscoveryCacheElem{
@ -31,6 +32,9 @@ void discovery_cache_destroy(struct cw_DiscoveryCache * c)
if (c->byaddrp)
mavl_destroy(c->byaddrp);
if (c->queue)
free(c->queue);
free(c);
}
@ -105,15 +109,24 @@ errX:
void discovery_cache_add(struct cw_DiscoveryCache *cache,
struct sockaddr * addr, struct cw_Mod * mod_capwap, struct cw_Mod * mod_bindings)
{
{
cw_dbg(DBG_X,"////////////////////////// ADDD CAHCE ///////////////////////");
char str[128];
sock_addrtostr(addr,str,128,1);
}
struct cw_DiscoveryCacheElem * cur = cache->queue+cache->qpos;
if (cur->cmod!=NULL){
/* delete here */
cw_dbg(DBG_X,"DOIN MAVL DEL ----- ///////////");
void * ptr = &cur;
mavl_del(cache->byaddr,ptr);
mavl_del(cache->byaddr,ptr);
mavl_del(cache->byaddrp,ptr);
}
cur->cmod=mod_capwap;
cur->bmod=mod_bindings;
sock_copyaddr(&cur->addr,addr);
@ -125,8 +138,8 @@ void discovery_cache_add(struct cw_DiscoveryCache *cache,
cache->ctrhi++;
}
mavl_add_ptr(cache->byaddr,cur);
mavl_add_ptr(cache->byaddrp,cur);
mavl_insert_ptr(cache->byaddr,cur);
mavl_insert_ptr(cache->byaddrp,cur);
cache->qpos++;
if (cache->qpos>=cache->len)
@ -141,9 +154,22 @@ int discovery_cache_get(struct cw_DiscoveryCache * cache,struct sockaddr *addr,
sock_copyaddr(&search.addr,addr);
search.ctrhi=search.ctrlo=0;
{
cw_dbg(DBG_X,"DISCOVERY CACHE ---------------------------- GET ENTER");
char str[128];
sock_addrtostr(addr,str,128,1);
}
search_ptr = &search;
result = mavl_get(cache->byaddrp ,&search_ptr);
if (result != NULL){
{
cw_dbg(DBG_X,"DISCOVERY CACHE ---------------------------- FOUND 1 with Port");
char str[128];
sock_addrtostr(addr,str,128,1);
}
elem = *result;
if (elem != NULL){
mavl_del(cache->byaddr,result);
@ -163,14 +189,36 @@ int discovery_cache_get(struct cw_DiscoveryCache * cache,struct sockaddr *addr,
result = mavl_get_first(cache->byaddr, &search_ptr);
if (result == NULL)
return 0;
{
cw_dbg(DBG_X,"DISCOVERY CACHE ---------------------------- DOUND BY ADDR");
char str[128];
sock_addrtostr(addr,str,128,1);
}
elem = *result;
if (elem != NULL){
cw_dbg(DBG_X,"elem != NULL");
{
cw_dbg(DBG_X,"DISCOVERY CACHE ---------------------------- DOUND BY ADDR");
char str[128];
sock_addrtostr((struct sockaddr*)&elem->addr,str,128,1);
printf("ELEM addr: %s\n",str);
}
if (sock_cmpaddr((struct sockaddr*)&elem->addr,addr,0)!=0)
return 0;
mavl_del(cache->byaddr,result);
mavl_del(cache->byaddrp,result);
cw_dbg(DBG_X,"DOIN MAVL DEL HERO ----- ///////////");
mavl_del(cache->byaddr,&elem);
cw_dbg(DBG_X,"DOIN MAVL DEL HERXXXXXXO ----- ///////////");
mavl_del(cache->byaddrp,&elem);
cw_dbg(DBG_X,"DOIN MAVL DEL HERO 0000 ----- ///////////");
*modcapwap=elem->cmod;
*modbindings=elem->bmod;

View File

@ -3,7 +3,7 @@
#include "cw/mod.h"
struct cw_DiscoveryCache * discovery_cache_create(int len);
@ -14,4 +14,5 @@ void discovery_cache_add(struct cw_DiscoveryCache *cache,
int discovery_cache_get(struct cw_DiscoveryCache * cache,struct sockaddr *addr,
struct cw_Mod ** modcapwap, struct cw_Mod **modbindings);
#endif
void discovery_cache_destroy(struct cw_DiscoveryCache * c);
#endif

View File

@ -1,838 +0,0 @@
/*
This file is part of actube.
actube is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
libcapwap is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Foobar. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdlib.h>
#include <stdint.h>
#include <string.h>
#include <stdio.h>
#include <errno.h>
#include <unistd.h> // sleep
#include "cw/capwap.h"
#include "cw/sock.h"
#include "cw/log.h"
#include "cw/timer.h"
#include "cw/cw.h"
#include "cw/dtls.h"
#include "cw/dbg.h"
#include "cw/conn.h"
#include "cw/format.h"
#include "ac.h"
#include "conf.h"
#include "db.h"
#include "socklist.h"
#include "wtpman.h"
#include "wtplist.h"
#include "cw/ktv.h"
static void reset_echointerval_timer(struct wtpman *wtpman)
{
char sock_buf[SOCK_ADDR_BUFSIZE];
/* uint16_t ct = mbag_get_word(wtpman->conn->local, CW_ITEM_CAPWAP_TIMERS,
CW_MAX_DISCOVERY_INTERVAL << 8 |
CAPWAP_ECHO_INTERVAL);
*/
/* start echinterval timer and put 2 seconds for "safety" on it */
/*
// wtpman->echointerval_timer = cw_timer_start(2+ (ct & 0xff));
// db_ping_wtp(sock_addr2str_p(&wtpman->conn->addr,sock_buf), conf_acname);
// cw_dbg(DBG_X, "Starting capwap timer: %d", wtpman->echointerval_timer);
*/
}
static int msg_start_handler(struct conn *conn, struct cw_action_in *a, uint8_t * data,
int len, struct sockaddr *from)
{
struct wtpman *wtpman = conn->data;
reset_echointerval_timer(wtpman);
return 0;
}
static void wtpman_remove(struct wtpman *wtpman)
{
wtplist_lock();
wtplist_remove(wtpman);
wtplist_unlock();
wtpman_destroy(wtpman);
}
static void wtpman_run_discovery(void *arg)
{
struct wtpman *wtpman = (struct wtpman *) arg;
time_t timer = cw_timer_start(10);
wtpman->conn->capwap_state = CAPWAP_STATE_DISCOVERY;
/*// wtpman->conn->actions = &capwap_actions;*/
/* wtpman->conn->outgoing = mbag_create();
wtpman->conn->incomming = mbag_create();
*/
wtpman->conn->remote_cfg = cw_ktv_create(); /*//mavl_cmp_kv,NULL,1312);*/
while (!cw_timer_timeout(timer)
&& wtpman->conn->capwap_state == CAPWAP_STATE_DISCOVERY) {
cw_read_messages(wtpman->conn);
}
/*
// struct mbag_item *wn = mbag_get(wtpman->conn->incomming, CW_ITEM_WTP_NAME);
// if (wn) {
// printf("WTP Name: %s\n", wn->data);
// exit(0);
// }
*/
wtpman_remove(wtpman);
return;
}
int xprocess_message(struct conn *conn, uint8_t * rawmsg, int rawlen,
struct sockaddr *from)
{
uint8_t *msgptr = rawmsg + cw_get_hdr_msg_offset(rawmsg);
uint32_t type = cw_get_msg_type(msgptr);
cw_log(LOG_ERR, "Hey: %d", type);
if (type == CAPWAP_MSG_DISCOVERY_REQUEST)
conn->capwap_state = CAPWAP_STATE_DISCOVERY;
return process_message(conn, rawmsg, rawlen, from);
}
static int wtpman_establish_dtls(void *arg)
{
char sock_buf[SOCK_ADDR_BUFSIZE];
struct wtpman *wtpman = (struct wtpman *) arg;
/* setup cipher */
wtpman->conn->dtls_cipher = conf_sslcipher;
/* setup DTSL certificates */
int dtls_ok = 0;
if (conf_sslkeyfilename && conf_sslcertfilename) {
wtpman->conn->dtls_key_file = conf_sslkeyfilename;
wtpman->conn->dtls_cert_file = conf_sslcertfilename;
wtpman->conn->dtls_key_pass = conf_sslkeypass;
wtpman->conn->dtls_verify_peer = conf_dtls_verify_peer;
cw_dbg(DBG_DTLS, "Using key file %s", wtpman->conn->dtls_key_file);
cw_dbg(DBG_DTLS, "Using cert file %s", wtpman->conn->dtls_cert_file);
dtls_ok = 1;
}
/* setup DTLS psk */
if (conf_dtls_psk) {
wtpman->conn->dtls_psk = conf_dtls_psk;
wtpman->conn->dtls_psk_len = strlen(conf_dtls_psk);
dtls_ok = 1;
}
if (!dtls_ok) {
cw_log(LOG_ERR,
"Can't establish DTLS session, neither psk nor certs set in config file.");
return 0;
}
/* try to accept the connection */
if (!dtls_accept(wtpman->conn)) {
cw_dbg(DBG_DTLS, "Error establishing DTLS session with %s",
sock_addr2str_p(&wtpman->conn->addr,sock_buf));
return 0;
}
cw_dbg(DBG_DTLS, "DTLS session established with %s, cipher=%s",
sock_addr2str_p(&wtpman->conn->addr,sock_buf), dtls_get_cipher(wtpman->conn));
return 1;
}
static int wtpman_join(void *arg, time_t timer)
{
char sock_buf[SOCK_ADDR_BUFSIZE];
struct wtpman *wtpman = (struct wtpman *) arg;
struct conn *conn = wtpman->conn;
/*
// wtpman->conn->outgoing = mbag_create();
// wtpman->conn->incomming = mbag_create();
// conn->config = conn->incomming;
// wtpman->conn->local = ac_config;
// mbag_set_str(conn->local, CW_ITEM_AC_NAME, conf_acname);
*/
wtpman->conn->capwap_state = CAPWAP_STATE_JOIN;
/*
// wtpman->conn->actions = &capwap_actions;
// wtpman->conn->itemstore = mbag_create();
*/
cw_dbg(DBG_INFO, "Join State - %s", sock_addr2str(&conn->addr,sock_buf));
int rc;
while (!cw_timer_timeout(timer) && wtpman->conn->capwap_state == CAPWAP_STATE_JOIN) {
rc = cw_read_messages(wtpman->conn);
if (rc < 0) {
break;
}
}
if (rc != 0) {
cw_log(LOG_ERR, "Error joining WTP %s", cw_strerror(rc));
return 0;
}
if (wtpman->conn->capwap_state == CAPWAP_STATE_JOIN) {
cw_dbg(DBG_MSG_ERR, "No join request from %s after %d seconds, WTP died.",
sock_addr2str(&wtpman->conn->addr,sock_buf), wtpman->conn->wait_dtls);
return 0;
}
return 1;
}
static void wtpman_image_data(struct wtpman *wtpman)
{
/* char sock_buf[SOCK_ADDR_BUFSIZE];
struct conn *conn = wtpman->conn;
// Image upload
const char *filename = mbag_get_str(conn->outgoing, CW_ITEM_IMAGE_FILENAME, NULL);
if (!filename) {
cw_log(LOG_ERR,
"Can't send image to %s. No Image Filename Item found.",
sock_addr2str(&conn->addr,sock_buf));
return;
}
cw_dbg(DBG_INFO, "Sending image file '%s' to '%s'.", filename,
sock_addr2str(&conn->addr,sock_buf));
FILE *infile = fopen(filename, "rb");
if (infile == NULL) {
cw_log(LOG_ERR, "Can't open image %s: %s",
sock_addr2str(&conn->addr,sock_buf), strerror(errno));
return;
}
CW_CLOCK_DEFINE(clk);
cw_clock_start(&clk);
mbag_item_t *eof = mbag_set_const_ptr(conn->outgoing, CW_ITEM_IMAGE_FILEHANDLE,
infile);
int rc = 0;
while (conn->capwap_state == CW_STATE_IMAGE_DATA && rc == 0 && eof != NULL) {
rc = cw_send_request(conn, CAPWAP_MSG_IMAGE_DATA_REQUEST);
eof = mbag_get(conn->outgoing, CW_ITEM_IMAGE_FILEHANDLE);
}
if (rc) {
cw_log(LOG_ERR, "Error sending image to %s: %s",
sock_addr2str(&conn->addr,sock_buf), cw_strrc(rc));
} else {
cw_dbg(DBG_INFO, "Image '%s' sucessful sent to %s in %0.1f seconds.",
filename, sock_addr2str(&conn->addr,sock_buf), cw_clock_stop(&clk));
conn->capwap_state = CW_STATE_NONE;
}
fclose(infile);
wtpman_remove(wtpman);
*/
}
void config_to_sql(struct conn *conn)
{
/*
// XXX for the moment we use just the IP adress as ID
char *wtp_id = sock_addr2str(&conn->addr);
// cw_dbg(DBG_X, "WTPID: %s\n", wtp_id);
MAVLITER_DEFINE(it, conn->incomming);
mavliter_foreach(&it) {
mbag_item_t *i = mavliter_get(&it);
const struct cw_itemdef *cwi =
cw_itemdef_get(conn->actions->items, i->id, NULL);
cw_dbg(DBG_X,"ID GOT: %s",i->id);
if (cwi) {
DBGX("SQL ID %s,%s", i->id, cwi->id);
DBGX("SQL Type %s,Typecwd %s", i->type->name, cwi->type->name);
// printf("%s != %s ?\n",i->type->name,cwi->type->name);
char str[256];
if (i->type->to_str) {
i->type->to_str(i, str);
db_put_wtp_prop(wtp_id, cwi->id, cwi->sub_id, str);
} else {
cw_log(LOG_ERR, "Can't converto to str for %s", cwi->id,
cwi->sub_id);
}
} else {
// DBGX("ID %d",i->id);
}
}
*/
}
void xradio_to_sql(struct conn *conn, char *wtp_id, int rid, int radio)
{
/*
MAVLITER_DEFINE(it, radio);
mavliter_foreach(&it) {
mbag_item_t *i = mavliter_get(&it);
const struct cw_itemdef *cwi =
cw_itemdef_get(conn->actions->radioitems, i->id, NULL);
if (cwi) {
char str[4096];
if (i->type->to_str) {
i->type->to_str(i, str);
// printf("I would put RID: %d, %s=>%s\n",rid,cwi->id,str);
char srid[6];
sprintf(srid,"%d",rid);
db_put_radio_prop(wtp_id,srid,cwi->id,cwi->sub_id,str);
// db_put_wtp_prop(wtp_id, cwi->id, cwi->sub_id, str);
} else {
cw_log(LOG_ERR, "Can't converto to str for %s", cwi->id,
cwi->sub_id);
}
} else {
// DBGX("ID %d",i->id);
}
}
// int rid = ((struct mbag_item*)mavliter_get(&it))->iid;
*/
}
/*
void radios_to_sql(struct conn *conn)
{
char sock_buf[SOCK_ADDR_BUFSIZE];
char *wtp_id = sock_addr2str(&conn->addr,sock_buf);
MAVLITER_DEFINE(it, conn->radios);
mavliter_foreach(&it) {
struct mbag_item * i = mavliter_get(&it);
int rid = i->u1.iid;
radio_to_sql(conn,wtp_id,rid,i->u2.data);
}
}
*/
void wtpman_run_data(void *wtpman_arg)
{
return;
struct wtpman *wtpman = (struct wtpman *) wtpman_arg;
struct conn *conn = wtpman->conn;
uint8_t data[1001];
memset(data, 0, 1000);
cw_log(LOG_ERR, "I am the data thread**********************************************************************\n");
while (1) {
sleep(5);
/*// conn->write_data(conn, data, 100);*/
cw_log(LOG_ERR, "O was the data thread***********************************************************\n");
}
}
static int msg_end_handler(struct conn *conn, struct cw_action_in *a, uint8_t * data,
int len, struct sockaddr *from)
{
/* if (a->msg_id ==CAPWAP_MSG_CHANGE_STATE_EVENT_REQUEST) {
props_to_sql(conn,conn->incomming,0);
radios_to_sql(conn);
}
*/
}
static void wtpman_run(void *arg)
{
char sock_buf[SOCK_ADDR_BUFSIZE];
struct wtpman *wtpman = (struct wtpman *) arg;
wtpman->conn->seqnum = 0;
struct conn *conn = wtpman->conn;
/* reject connections to our multi- or broadcast sockets */
/* if (socklist[wtpman->socklistindex].type != SOCKLIST_UNICAST_SOCKET) {
cw_dbg(DBG_DTLS, "Dropping connection from %s to non-unicast socket.",
CLIENT_IP);
wtpman_remove(wtpman);
return;
}
*/
time_t timer = cw_timer_start(wtpman->conn->wait_dtls);
/* establish dtls session */
/* if (!wtpman_establish_dtls(wtpman)) {
wtpman_remove(wtpman);
return;
}
*/
/* dtls is established, goto join state */
if (!wtpman_join(wtpman, timer)) {
wtpman_remove(wtpman);
return;
}
conn->msg_start = msg_start_handler;
cw_dbg(DBG_INFO, "WTP from %s has joined with session id: %s",
sock_addr2str_p(&conn->addr,sock_buf),
format_bin2hex(conn->session_id,16));
/*
// cw_dbg(DBG_INFO, "Creating data thread");
// pthread_t thread;
// pthread_create(&thread, NULL, (void *) wtpman_run_data, (void *) wtpman);
*/
/* here the WTP has joined, now we assume an image data request
or an configuration status request. Nothing else.
*/
int rc = 0;
while (!cw_timer_timeout(timer)
&& wtpman->conn->capwap_state == CW_STATE_CONFIGURE) {
rc = cw_read_messages(wtpman->conn);
if (rc < 0) {
if (errno != EAGAIN)
break;
}
}
if (!cw_result_is_ok(rc)) {
cw_dbg(DBG_INFO, "WTP Problem: %s", cw_strrc(rc));
wtpman_remove(wtpman);
return;
}
if (conn->capwap_state == CW_STATE_IMAGE_DATA) {
wtpman_image_data(wtpman);
return;
}
conn->capwap_state = CW_STATE_RUN;
/*
// XXX testing ...
// DBGX("Cofig to sql", "");
// props_to_sql(conn,conn->incomming,0);
// radios_to_sql(conn);
*/
conn->msg_end=msg_end_handler;
/* The main run loop */
reset_echointerval_timer(wtpman);
rc = 0;
while (wtpman->conn->capwap_state == CW_STATE_RUN) {
rc = cw_read_messages(wtpman->conn);
if (rc < 0) {
if (errno != EAGAIN)
break;
}
/*// cw_dbg(DBG_X, "Time left: %d",
//*/
cw_timer_timeleft(wtpman->echointerval_timer);
if (cw_timer_timeout(wtpman->echointerval_timer)) {
cw_dbg(DBG_INFO, "Lost connection to WTP:%s",
sock_addr2str_p(&conn->addr,sock_buf));
break;
}
/*
// mavl_del_all(conn->outgoing);
// conn_clear_upd(conn,1);
// props_to_sql(conn,conn->incomming,0);
// radios_to_sql(conn);
*/
mavl_t r;
r = db_get_update_tasks(conn, sock_addr2str(&conn->addr,sock_buf));
if (r) {
/*
// if (!conn->outgoing->count)
// continue;
*/
cw_dbg(DBG_INFO, "Updating WTP %s",sock_addr2str(&conn->addr,sock_buf));
rc = cw_send_request(conn, CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST);
/*
// mavl_merge(conn->config, conn->outgoing);
// mavl_destroy(conn->outgoing);
// conn->outgoing = mbag_create();
// props_to_sql(conn,conn->incomming,0);
// radios_to_sql(conn);
// mavl_destroy(r);
*/
}
r = db_get_radio_tasks(conn, sock_addr2str(&conn->addr,sock_buf));
if (r) {
/*
// if (!conn->radios_upd->count)
// continue;
*/
cw_dbg(DBG_INFO, "Updating Radios for %s",sock_addr2str(&conn->addr,sock_buf));
rc = cw_send_request(conn, CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST);
/*
// conn_clear_upd(conn,1);
// mavl_destroy(conn->radios_upd);
// conn->radios_upd=mbag_i_create();
// radios_to_sql(conn);
*/
/*
rc = cw_send_request(conn, CW_MSG_CONFIGURATION_UPDATE_REQUEST);
mavl_merge(conn->config, conn->outgoing);
mavl_destroy(conn->outgoing);
conn->outgoing = mbag_create();
config_to_sql(conn);
radios_to_sql(conn);
mavl_destroy(r);
*/
}
}
db_ping_wtp(sock_addr2str_p(&conn->addr,sock_buf), "");
wtpman_remove(wtpman);
return;
}
static void wtpman_run_dtls(void *arg)
{
char sock_buf[SOCK_ADDR_BUFSIZE];
struct wtpman *wtpman = (struct wtpman *) arg;
/* reject connections to our multi- or broadcast sockets */
if (socklist[wtpman->socklistindex].type != SOCKLIST_UNICAST_SOCKET) {
cw_dbg(DBG_DTLS, "Dropping connection from %s to non-unicast socket.",
sock_addr2str_p(&wtpman->conn->addr,sock_buf));
wtpman_remove(wtpman);
return;
}
/*// time_t timer = cw_timer_start(wtpman->conn->wait_dtls);*/
/* establish dtls session */
if (!wtpman_establish_dtls(wtpman)) {
wtpman_remove(wtpman);
return;
}
wtpman_run(arg);
}
void wtpman_destroy(struct wtpman *wtpman)
{
if (wtpman->conn)
conn_destroy(wtpman->conn);
free(wtpman);
}
struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr)
{
char sock_buf[SOCK_ADDR_BUFSIZE];
struct wtpman *wtpman;
wtpman = malloc(sizeof(struct wtpman));
if (!wtpman)
return 0;
memset(wtpman, 0, sizeof(struct wtpman));
int replyfd;
if (socklist[socklistindex].type != SOCKLIST_UNICAST_SOCKET) {
int port = sock_getport(&socklist[socklistindex].addr);
replyfd = socklist_find_reply_socket(srcaddr, port);
if (replyfd == -1) {
cw_log(LOG_ERR, "Can't find reply socket for request from %s",
sock_addr2str(srcaddr,sock_buf));
free(wtpman);
return NULL;
}
} else {
replyfd = socklist[socklistindex].sockfd;
}
int sockfd = replyfd; /*//socklist[socklistindex].reply_sockfd;
*/
struct sockaddr dbgaddr;
socklen_t dbgaddrl = sizeof(dbgaddr);
getsockname(sockfd, &dbgaddr, &dbgaddrl);
cw_dbg(DBG_INFO, "Creating wtpman on socket %d, %s:%d", sockfd,
sock_addr2str(&dbgaddr,sock_buf), sock_getport(&dbgaddr));
/*
//extern int conn_process_packet2(struct conn *conn, uint8_t * packet, int len,
// struct sockaddr *from);
*/
wtpman->conn = conn_create(sockfd, srcaddr, 100);
wtpman->conn->role = CW_ROLE_AC;
wtpman->conn->data_sock = socklist[socklistindex].data_sockfd;
sock_copyaddr(&wtpman->conn->data_addr, (struct sockaddr *) &wtpman->conn->addr);
/*
// wtpman->conn->process_packet = conn_process_packet2;
*/
if (!wtpman->conn) {
wtpman_destroy(wtpman);
return NULL;
}
wtpman->conn->mods = conf_mods;
wtpman->conn->strict_capwap = conf_strict_capwap;
wtpman->conn->strict_hdr = conf_strict_headers;
/*
// wtpman->conn->radios = mbag_i_create();
// wtpman->conn->radios_upd = mbag_i_create();
// wtpman->conn->local = ac_config;
//wtpman->conn->capwap_mode=0; //CW_MODE_STD; //CISCO;
// wtpman->conn->capwap_mode = CW_MODE_CISCO;
//wtpman->conn->strict_capwap_hdr=0;
*/
wtpman->conn->local_cfg = cw_ktv_create();
wtpman->conn->global_cfg = actube_global_cfg;
wtpman->conn->local_cfg = actube_global_cfg;
return wtpman;
}
void wtpman_addpacket(struct wtpman *wtpman, uint8_t * packet, int len)
{
conn_q_add_packet(wtpman->conn, packet, len);
}
int nodtls = 0;
void wtpman_start(struct wtpman *wtpman, int dtlsmode)
{
if (dtlsmode) {
cw_dbg(DBG_INFO, "Starting wtpman in DTLS mode");
pthread_create(&wtpman->thread, NULL, (void *) wtpman_run_dtls,
(void *) wtpman);
} else {
cw_dbg(DBG_INFO, "Starting wtpman in non-dtls mode");
if (nodtls) {
wtpman->conn->process_message = xprocess_message;
pthread_create(&wtpman->thread, NULL, (void *) wtpman_run,
(void *) wtpman);
return;
}
pthread_create(&wtpman->thread, NULL, (void *) wtpman_run_discovery,
(void *) wtpman);
}
}
void wtpman_lw_addpacket(struct wtpman *wtpman, uint8_t * packet, int len)
{
/*
// uint8_t * m = packet+12;
// int l = LWTH_GET_LENGTH(packet+6);
*/
uint8_t *msg = packet + 12;
int msgtype = LWMSG_GET_TYPE(msg);
int msglen = LWMSG_GET_LEN(msg);
printf("Type is %d, Len is %d\n", msgtype, msglen);
/*
// uint8_t *msgdata = LWMSG_GET_DATA(msg);
*/
/*
int c=0;
while (c < msglen){
int eltype = LWMSGELEM_GET_TYPE(data);
int ellen = LWMSGELEM_GET_LEN(data);
printf ("ELEM TYPE: %d, LEN: %d\n",eltype,ellen);
c+=ellen+3;
data=data+ellen+3;
}
*/
/*//uint8_t *data;*/
/*
lw_foreach_msgelem(data,msgdata,msglen){
int eltype = LWMSGELEM_GET_TYPE(data);
int ellen = LWMSGELEM_GET_LEN(data);
uint8_t * eldata = LWMSGELEM_GET_DATA(data);
wtpinfo_lwreadelem_wtp_descriptor(&wtpman->wtpinfo,eltype,eldata,ellen);
printf ("ELEM TYPE: %d, LEN: %d\n",eltype,ellen);
}
*/
/*
// char wi[4096];
// wtpinfo_print(wi, &wtpman->wtpinfo);
// printf("WTPINFO: \n%s\n", wi);
// char buffer[2048];
// struct lwmsg lwmsg;
// lwmsg_init(&lwmsg, buffer,conf_macaddress,LWMSG_DISCOVERY_RESPONSE,conn_get_next_seqnum(wtpman->conn));
// conn_send_packet(wtpman->conn,buffer,60);
*/
}
/*
void wtpman_lw_start(struct wtpman *wtpman)
{
}
*/

View File

@ -1,65 +0,0 @@
#ifndef __WTPMAN_H
#define __WTPMAN_H
#include <sys/socket.h>
#include <semaphore.h>
#include <pthread.h>
#include "cw/capwap.h"
#include "cw/fragman.h"
#include "cw/timer.h"
#define WTPMAN_QSIZE 1024
struct wtpman{
pthread_t thread;
/* packet queue */
/* uint8_t * q[WTPMAN_QSIZE];
int qrpos;
int qwpos;
sem_t q_sem;
*/
struct conn * conn;
/* wtp data */
uint8_t * wtp_name;
uint8_t * wtp_location;
uint8_t * session_id;
uint8_t wtp_mactype;
/* //struct wtpinfo wtpinfo;*/
int socklistindex;
int connected;
cw_timer_t echointerval_timer;
};
/*
struct wtp{
};
//extern void wtpman_run(void *arg);
*/
extern struct wtpman * wtpman_create();
extern struct wtpman * wtpman_create(int socklistindex,struct sockaddr * srcaddr);
extern void wtpman_addpacket(struct wtpman * wtpman,uint8_t *packet,int len);
extern void wtpman_destroy(struct wtpman * wtpman);
extern void wtpman_start(struct wtpman * wtpman,int dtlsmode);
#endif

722
src/ac/rpc.c Normal file
View File

@ -0,0 +1,722 @@
#include <stdio.h>
#include <errno.h>
#include <string.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <sys/wait.h>
#include <arpa/telnet.h>
#include <histedit.h>
#include "cw/sock.h"
#include "cw/log.h"
#include "cw/dbg.h"
#include "cw/connlist.h"
#include "wtplist.h"
#include "ac.h"
struct rpcdata{
FILE *in;
FILE *out;
char prompt[1024];
cw_Cfg_t * update_cfg;
cw_Cfg_t * global_cfg;
char *history[2000];
char line[4096];
int pos;
char esc[8];
int escpos;
int quit;
History *hist;
HistEvent ev;
Tokenizer *tok;
EditLine *el;
};
struct sockdata{
const char *name;
int fd;
cw_Cfg_t * global_cfg;
};
int select_cmd(struct rpcdata *sd, const char *cmd);
int list_cmd(struct rpcdata *sd, const char * cmd);
int cfg_cmd(struct rpcdata *sd, const char * cmd);
int ucfg_cmd(struct rpcdata *sd, const char * cmd);
int set_cmd(struct rpcdata *sd, const char * cmd);
int del_cmd(struct rpcdata *sd, const char * cmd);
int send_cmd(struct rpcdata *sd, const char * cmd);
int wlan0_cmd(struct rpcdata *sd, const char * cmd);
int exit_cmd(struct rpcdata *sd, const char * cmd);
int prompt_cmd(struct rpcdata *sd, const char * cmd);
int global_cfg_cmd(struct rpcdata *sd, const char * cmd);
//void show_cfg (FILE *out, mavl_t ktv);
int show_aps (FILE *out);
struct cw_Conn * find_ap(const char *name);
struct command{
char * cmd;
int (*fun)(struct rpcdata *sd, const char *cmd);
};
static struct command cmdlist[]={
{"exit",exit_cmd},
{"bumm",exit_cmd},
{"cfg", cfg_cmd },
{"del", del_cmd },
{"ucfg", ucfg_cmd},
{"list", list_cmd },
{"select", select_cmd },
{"send", send_cmd},
{"set", set_cmd },
{"wlan0",wlan0_cmd},
{"global_cfg", global_cfg_cmd},
{"@prompt",prompt_cmd},
{NULL,NULL}
};
static void finish_cmd(FILE *f)
{
fprintf(f,"\n");
fflush(f);
}
int prompt_cmd(struct rpcdata *sd, const char *cmd)
{
const char *acname = cw_cfg_get(sd->global_cfg,"capwap/ac-name","actube");
fprintf(sd->out,"%s[%s]:>\n",acname,sd->prompt);
finish_cmd(sd->out);
return 0;
}
int global_cfg_cmd(struct rpcdata *sd, const char *cmd)
{
cw_cfg_fdump(sd->out,sd->global_cfg);
finish_cmd(sd->out);
return 0;
}
int select_cmd(struct rpcdata *sd, const char *cmd)
{
char ap [CAPWAP_MAX_WTP_NAME_LEN];
sscanf(cmd,"%s",ap);
strcpy(sd->prompt,ap);
finish_cmd(sd->out);
return 0;
}
int list_cmd(struct rpcdata *sd, const char *cmd)
{
show_aps(sd->out);
finish_cmd(sd->out);
return 0;
}
int exit_cmd(struct rpcdata *sd, const char *cmd)
{
//fprintf(sd->out,"Unknown command: '%s'\n\r\n\r",cmd);
// printf("Exitcmd %s\n",cmd);
//fprintf(sd->out,"END: %s\n\r",cmd);
finish_cmd(sd->out);
fflush(sd->out);
return 1;
}
int cfg_cmd(struct rpcdata *sd, const char *cmd)
{
struct cw_Conn * conn;
wtplist_lock();
conn = find_ap(sd->prompt);
if (conn==NULL){
fprintf(sd->out,"WTP '%s' not found\n",sd->prompt);
}
else {
cw_cfg_fdump(sd->out,conn->remote_cfg);
}
finish_cmd(sd->out);
wtplist_unlock();
return 0;
}
int ucfg_cmd(struct rpcdata *sd, const char *cmd)
{
// struct cw_Conn * conn;
stop();
// show_cfg(sd->out,sd->update_cfg);
return 0;
}
#include "wtpman.h"
int
send_cmd(struct rpcdata * sd, const char *cmd)
{
struct cw_Conn * conn;
wtplist_lock();
conn = find_ap(sd->prompt);
if (conn==NULL){
fprintf(sd->out,"WTP '%s' not found\n",sd->prompt);
}
else {
conn->update_cfg=sd->update_cfg;
}
wtplist_unlock();
return 0;
}
int
wlan0_cmd(struct rpcdata * sd, const char *cmd)
{
stop();
struct cw_Conn * conn;
wtplist_lock();
conn = find_ap(sd->prompt);
if (conn==NULL){
fprintf(sd->out,"WTP '%s' not found\n",sd->prompt);
}
else {
FILE *f=fopen("wlan0.ktv","r");
// cw_ktv_read_file(f,sd->update_cfg,conn->msgset->types_tree);
//conn->update_cfg=sd->update_cfg;
fclose(f);
}
wtplist_unlock();
return 0;
}
int set_cmd(struct rpcdata *sd, const char *str)
{
cw_Cfg_t *cfg;
cfg = cw_cfg_create();
cw_cfg_read_from_string(str,cfg);
cw_cfg_fdump(sd->out,cfg);
cw_cfg_destroy(cfg);
finish_cmd(sd->out);
// cw_ktv_init_str_reader(&r,str,strlen(str));
// cw_ktv_parse_string(&r,key,type,val);
/*cw_ktv_parse_string(key,type,val, 2048);*/
// fprintf(sd->out,"%s %s\n",key,val);
// cw_ktv_add(sd->update_cfg,key,CW_TYPE_STR,NULL,val,strlen(val));
return 0;
}
int del_cmd(struct rpcdata *sd, const char *str)
{
char key[CW_CFG_MAX_KEY_LEN];
sscanf(str,"%s",key);
stop();
// cw_ktv_del_sub(sd->update_cfg,key);
//
return 0;
}
/*
void show_cfg (FILE *out, mavl_t ktv)
{
char value[500];
struct cw_Val * data;
mavliter_t it;
const struct cw_Type * type;
mavliter_init(&it,ktv);
mavliter_foreach(&it){
data = mavliter_get(&it);
type = data->type;
type->to_str(data,value,0);
fprintf(out,"%s :%s: %s\n",data->key,type->get_type_name(data), value);
}
}
*/
void print_mw(FILE *f, int w, const char * str)
{
int n,i;
fprintf(f, "%.*s",w,str);
n=strlen(str);
if ( n>w ){
fprintf(f,"> ");
return;
}
n = w-n;
for(i=0;i<(n+2);i++){
fprintf(f,"%c",' ');
}
}
int show_aps (FILE *out)
{
struct connlist * cl;
mavliter_t it;
wtplist_lock();
cl = wtplist_get_connlist();
mavliter_init (&it, cl->by_addr);
print_mw (out, 16, "AP Name");
print_mw (out, 16, "AP Model");
print_mw (out, 14, "Vendor");
print_mw (out, 16, "IP ");
fprintf(out,"\n");
mavliter_foreach (&it) {
char addr[SOCK_ADDR_BUFSIZE];
const char *vendor;
struct cw_Conn * conn;
conn = mavliter_get_ptr (&it);
print_mw(out,16,cw_cfg_get(conn->remote_cfg, "capwap/wtp-name", "Unknown"));
print_mw(out,16,cw_cfg_get(conn->remote_cfg, "capwap/wtp-board-data/model-no", "Unknown"));
vendor = cw_cfg_get(conn->remote_cfg, "capwap/wtp-board-data/vendor", "0");
print_mw(out,14,vendor);
sock_addr2str_p (&conn->addr, addr);
print_mw(out,16,addr);
fprintf(out,"\n");
}
wtplist_unlock();
return 0;
}
struct cw_Conn * find_ap(const char *name)
{
struct connlist * cl;
mavliter_t it;
cl = wtplist_get_connlist();
mavliter_init (&it, cl->by_addr);
mavliter_foreach (&it) {
const char *wtpname;
struct cw_Conn * conn;
conn = mavliter_get_ptr (&it);
wtpname = cw_cfg_get (conn->remote_cfg, "capwap/wtp-name", NULL);
if (wtpname == NULL)
continue;
if(strcmp(wtpname,name)==0){
return conn;
}
}
return NULL;
}
void con (FILE *out)
{
stop();
/*
struct connlist * cl;
mavliter_t it;
wtplist_lock();
cl = wtplist_get_connlist();
mavliter_init (&it, cl->by_addr);
fprintf (out, "IP\t\t\twtp-name\n");
mavliter_foreach (&it) {
cw_Val_t * result;
char addr[SOCK_ADDR_BUFSIZE];
char wtp_name[CAPWAP_MAX_WTP_NAME_LEN];
struct cw_Conn * conn;
conn = mavliter_get_ptr (&it);
sock_addr2str_p (&conn->addr, addr);
result = cw_ktv_get (conn->remote_cfg, "wtp-name", NULL);
if (result == NULL) {
strcpy (wtp_name, "");
} else {
result->type->to_str (result, wtp_name, CAPWAP_MAX_WTP_NAME_LEN);
}
fprintf (out, "Con!! %s\t\t%s\n", addr, wtp_name);
{
stop();
mavl_t update;
// update = cw_ktv_create();
// cw_ktv_set_byte(update,"radio.255/admin-state",1);
// conn->update_cfg=update;
}
fprintf(out,"\n");
}
wtplist_unlock();
*/
}
struct command * find_cmd(const char *cmd)
{
struct command * search,*result;
result=NULL;
search = cmdlist;
while (search->cmd!=NULL){
if (strncmp(cmd,search->cmd,strlen(cmd))==0){
if (result==NULL)
result = search;
else
return NULL;
}
search ++;
}
return result;
}
int execute_cmd (struct rpcdata * sd, const char *str)
{
char cmd[1024];
char args[1024];
int n;
struct cw_Val_Reader reader;
struct command * searchcmd;
args[0]=0;
n = sscanf (str, "%s", cmd);
if (n<=0)
return 0;
searchcmd = find_cmd(cmd);
if (searchcmd!=NULL){
if (searchcmd->fun != NULL){
return searchcmd->fun(sd, str+strlen(cmd));
}
}
else{
fprintf(sd->out,"Unknown command: '%s'\n",cmd);
finish_cmd(sd->out);
}
return 0;
char key[CW_CFG_MAX_KEY_LEN];
char type[128];
char val[2048];
key[0]=0;
type[0]=0;
val[0]=0;
stop();
// cw_ktv_init_str_reader(&reader,str, strlen(str));
// n = cw_ktv_parse_string(&reader, key,type,val);
if (n==-1){
int i;
fprintf(sd->out,"Error on pos %d\n",reader.pos);
fprintf(sd->out,"%s",str);
for(i=0;i<reader.pos;i++){
fprintf(sd->out," ");
}
fprintf(sd->out,"^\n");
fprintf(sd->out,"%s\n",reader.error);
}
else{
fprintf(sd->out,"%s :%s: %s\n", key,type,val);
}
return 0;
n = sscanf (str, "%s%s", cmd, args);
if (n<=0)
return 0;
/*printf("CMD: %s, ARGS:\n",cmd);*/
if (strcmp (cmd, "s") == 0) {
show_aps (sd->out);
return 0;
}
if (strcmp (cmd, "con")==0){
con(sd->out);
return 0;
}
return 0;
}
struct esc_strings {
char *str;
char * result;
};
struct esc_strings estr[] = {
{"\x1b[H", "home"},
{"\x1b[F", "end"},
{"\x1b[A", "up"},
{"\x1b[B", "donw"},
{"\x1b[D", "left"},
{"\x1b[C", "right"},
{NULL,NULL}
};
void rpc_loop (FILE *file, cw_Cfg_t *global_cfg)
{
struct rpcdata sd;
int c;
c=0;
char str[2048];
sd.in = file;
sd.out = file;
sd.global_cfg=global_cfg;
sprintf(sd.prompt,"%s","*");
sd.quit=0;
do {
str[0]=0;
fgets (str, sizeof (str), file);
if (execute_cmd (&sd, str)) {
break;
}
} while (c != EOF);
}
void * run_rpc_server (void * arg)
{
char sockstr[SOCK_ADDR_BUFSIZE];
struct sockdata * sockdata;
int clientsock;
struct sockaddr_storage client;
socklen_t client_size;
sockdata = (struct sockdata *)arg;
memset(&client,0,sizeof(client));
client_size=sizeof(client);
cw_dbg(DBG_INFO,"Starting RPC Service, listening on: %s (sock fd: %d)",sockdata->name, sockdata->fd);
while(1){
clientsock = accept (sockdata->fd, (struct sockaddr*) &client, &client_size);
if (clientsock == -1){
cw_log (LOG_ERR, "Accept error '%s', %s", "addr", strerror (errno));
return NULL;
}
if (clientsock > 0) {
sock_addr2str_p (&client, sockstr);
cw_dbg (DBG_INFO, "Accepting RPC session from %s", sockstr);
rpc_loop (fdopen (clientsock, "a+"),sockdata->global_cfg);
close (clientsock);
}
//cw_dbg (DBG_INFO,"Accepting shell session %i, %s", rc, strerror (errno));
}
return NULL;
}
int create_tcp_fd(const char *name)
{
struct sockaddr_storage server; //, client;
int rc;
const char * addr = name;
int sockfd;
int yes;
rc = sock_strtoaddr (addr, (struct sockaddr*) &server);
if (! rc) {
cw_log (LOG_ERR, "Can't parse address '%s', %s", addr, strerror (errno));
return -1;
}
sockfd = socket ( ( (struct sockaddr*) &server)->sa_family, SOCK_STREAM, 0);
yes = 1;
/* reuse address */
setsockopt (sockfd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof (yes));
/* bind address */
rc = bind (sockfd, (struct sockaddr*) &server, sizeof (struct sockaddr));
if (rc) {
cw_log (LOG_ERR, "Can't bind socket address '%s', %s", addr, strerror (errno));
return -1;
}
return sockfd;
}
static int create_unix_fd(const char *name)
{
//struct sockaddr_storage client;
//socklen_t client_size;
struct sockaddr_un addr;
int rc,fd;
unlink(name);
fd = socket(PF_UNIX, SOCK_STREAM, 0);
sock_addrinit((struct sockaddr_storage*)&addr,AF_UNIX);
strncpy(addr.sun_path, name, sizeof(addr.sun_path)-1);
rc = bind(fd, (struct sockaddr*)&addr, sizeof(addr));
if (rc) {
cw_log (LOG_ERR, "Can't bind socket 'unix:%s', %s", name, strerror (errno));
return -1;
}
//int clientsock = accept (fd, (struct sockaddr*) &client, &client_size);
return fd;
}
int start_rpc(cw_Cfg_t *global_cfg)
{
struct sockdata * sockdata;
const char *sockname;
int rc; //, type;
int fd;
rc = cw_cfg_get_bool(global_cfg,"actube/rpc/enable",1);
if (!rc)
return 1;
sockdata = malloc(sizeof(struct sockdata));
if (sockdata==NULL)
return 0;
memset(sockdata,0,sizeof(struct sockdata));
sockdata->global_cfg = global_cfg;
sockdata->fd=-1;
sockname = cw_cfg_get(global_cfg,"actube/rpc/listen",NULL);
if (sockname==NULL) {
cw_log (LOG_ERR, "Can't get RPC listen address from global_cfg 'actube/rpc/listen");
goto errX;
}
if (strncmp("unix:",sockname,strlen("unix:"))==0){
fd = create_unix_fd(strchr(sockname,':')+1);
if (fd==-1)
goto errX;
sockdata->name=cw_strdup(sockname);
sockdata->fd=fd;
}else if (strncmp("tcp:",sockname,strlen("tcp:"))==0){
fd = create_tcp_fd(strchr(sockname,':')+1);
if (fd==-1)
goto errX;
sockdata->name=cw_strdup(sockname);
sockdata->fd=fd;
}else {
fd = create_tcp_fd(sockname);
if (fd==-1)
goto errX;
sockdata->name=cw_strdup(sockname);
sockdata->fd=fd;
}
rc = listen (sockdata->fd, 5);
if (rc) {
cw_log (LOG_ERR, "Can't listen on address '%s', %s", "addr", strerror (errno));
goto errX;
}
pthread_t thread;
pthread_create (&thread, NULL, run_rpc_server,
sockdata);
return 1;
errX:
if (sockdata->fd!=-1)
close(sockdata->fd);
if (sockdata->name)
free((void*)sockdata->name);
free(sockdata);
return 0;
}

View File

@ -1,466 +0,0 @@
#include <stdio.h>
#include <errno.h>
#include <string.h>
#include <sys/types.h>
#include <sys/socket.h>
#include "cw/sock.h"
#include "cw/log.h"
#include "cw/dbg.h"
#include "cw/connlist.h"
#include "wtplist.h"
struct shelldata{
FILE *out;
char prompt[1024];
mavl_t update_cfg;
};
void select_cmd(struct shelldata *sd, const char *cmd);
void list_cmd(struct shelldata *sd, const char * cmd);
void cfg_cmd(struct shelldata *sd, const char * cmd);
void ucfg_cmd(struct shelldata *sd, const char * cmd);
void set_cmd(struct shelldata *sd, const char * cmd);
void del_cmd(struct shelldata *sd, const char * cmd);
void send_cmd(struct shelldata *sd, const char * cmd);
void show_cfg (FILE *out, mavl_t ktv);
void show_aps (FILE *out);
struct conn * find_ap(const char *name);
struct command{
char * cmd;
void (*fun)();
};
static struct command cmdlist[]={
{"cfg", cfg_cmd },
{"del", del_cmd },
{"ucfg", ucfg_cmd},
{"list", list_cmd },
{"select", select_cmd },
{"send", send_cmd},
{"set", set_cmd },
{NULL,NULL}
};
void select_cmd(struct shelldata *sd, const char *cmd)
{
char ap [CAPWAP_MAX_WTP_NAME_LEN];
sscanf(cmd,"%s",ap);
strcpy(sd->prompt,ap);
}
void list_cmd(struct shelldata *sd, const char *cmd)
{
show_aps(sd->out);
}
void cfg_cmd(struct shelldata *sd, const char *cmd)
{
struct conn * conn;
wtplist_lock();
conn = find_ap(sd->prompt);
if (conn==NULL){
fprintf(sd->out,"WTP '%s' not found\n",sd->prompt);
}
else {
show_cfg(sd->out,conn->remote_cfg);
}
wtplist_unlock();
}
void ucfg_cmd(struct shelldata *sd, const char *cmd)
{
struct conn * conn;
show_cfg(sd->out,sd->update_cfg);
}
#include "wtpman.h"
void
send_cmd(struct shelldata * sd, const char *cmd)
{
struct conn * conn;
wtplist_lock();
conn = find_ap(sd->prompt);
if (conn==NULL){
fprintf(sd->out,"WTP '%s' not found\n",sd->prompt);
}
else {
conn->update_cfg=sd->update_cfg;
}
wtplist_unlock();
}
void set_cmd(struct shelldata *sd, const char *str)
{
struct conn * conn;
struct cw_KTV_Reader r;
char key[CW_KTV_MAX_KEY_LEN];
char type[CW_KTV_MAX_KEY_LEN];
char val[2048];
cw_ktv_init_str_reader(&r,str,strlen(str));
cw_ktv_parse_string(&r,key,type,val);
/*cw_ktv_parse_string(key,type,val, 2048);*/
fprintf(sd->out,"%s :%s: %s\n",key,type,val);
cw_ktv_add(sd->update_cfg,key,CW_TYPE_STR,NULL,val,strlen(val));
}
void del_cmd(struct shelldata *sd, const char *str)
{
char key[CW_KTV_MAX_KEY_LEN];
sscanf(str,"%s",key);
cw_ktv_del_sub(sd->update_cfg,key);
}
void show_cfg (FILE *out, mavl_t ktv)
{
char value[500];
struct cw_KTV * data;
mavliter_t it;
const struct cw_Type * type;
mavliter_init(&it,ktv);
mavliter_foreach(&it){
data = mavliter_get(&it);
type = data->type;
type->to_str(data,value,0);
fprintf(out,"%s :%s: %s\n",data->key,type->get_type_name(data), value);
}
}
void show_aps (FILE *out)
{
struct connlist * cl;
mavliter_t it;
wtplist_lock();
cl = wtplist_get_connlist();
mavliter_init (&it, cl->by_addr);
fprintf (out, "IP\t\t\twtp-name\n");
mavliter_foreach (&it) {
cw_KTV_t * result;
char addr[SOCK_ADDR_BUFSIZE];
char wtp_name[CAPWAP_MAX_WTP_NAME_LEN];
struct conn * conn;
conn = mavliter_get_ptr (&it);
sock_addr2str_p (&conn->addr, addr);
result = cw_ktv_get (conn->remote_cfg, "wtp-name", NULL);
if (result == NULL) {
strcpy (wtp_name, "");
} else {
result->type->to_str (result, wtp_name, CAPWAP_MAX_WTP_NAME_LEN);
}
fprintf (out, "%s\t\t%s\n", addr, wtp_name);
}
wtplist_unlock();
}
struct conn * find_ap(const char *name)
{
struct connlist * cl;
mavliter_t it;
/*wtplist_lock();*/
cl = wtplist_get_connlist();
mavliter_init (&it, cl->by_addr);
mavliter_foreach (&it) {
cw_KTV_t * result;
char wtp_name[CAPWAP_MAX_WTP_NAME_LEN];
struct conn * conn;
conn = mavliter_get_ptr (&it);
result = cw_ktv_get (conn->remote_cfg, "wtp-name", NULL);
if (result == NULL) {
strcpy (wtp_name, "");
} else {
result->type->to_str (result, wtp_name, CAPWAP_MAX_WTP_NAME_LEN);
}
printf("cmp '%s' : '%s'\n",wtp_name,name);
if(strcmp(wtp_name,name)==0){
return conn;
}
}
return NULL;
/*wtplist_unlock();*/
}
void con (FILE *out)
{
struct connlist * cl;
mavliter_t it;
wtplist_lock();
cl = wtplist_get_connlist();
mavliter_init (&it, cl->by_addr);
fprintf (out, "IP\t\t\twtp-name\n");
mavliter_foreach (&it) {
cw_KTV_t * result;
char addr[SOCK_ADDR_BUFSIZE];
char wtp_name[CAPWAP_MAX_WTP_NAME_LEN];
struct conn * conn;
conn = mavliter_get_ptr (&it);
sock_addr2str_p (&conn->addr, addr);
result = cw_ktv_get (conn->remote_cfg, "wtp-name", NULL);
if (result == NULL) {
strcpy (wtp_name, "");
} else {
result->type->to_str (result, wtp_name, CAPWAP_MAX_WTP_NAME_LEN);
}
fprintf (out, "Con!! %s\t\t%s\n", addr, wtp_name);
{
mavl_t update;
update = cw_ktv_create();
cw_ktv_set_byte(update,"radio.255/admin-state",1);
conn->update_cfg=update;
}
fprintf(out,"\n");
}
wtplist_unlock();
}
struct command * find_cmd(const char *cmd)
{
struct command * search;
search = cmdlist;
while (search->cmd!=NULL){
if (strncmp(cmd,search->cmd,strlen(cmd))==0){
return search;
}
search ++;
}
return NULL;
}
void execute_cmd (struct shelldata * sd, const char *str)
{
char cmd[1024];
char args[1024];
int n;
struct cw_KTV_Reader reader;
struct command * searchcmd;
args[0]=0;
n = sscanf (str, "%s", cmd);
if (n<=0)
return;
searchcmd = find_cmd(cmd);
if (searchcmd!=NULL){
if (searchcmd->fun != NULL){
fprintf(sd->out,"%s %s\n", searchcmd->cmd,str+strlen(cmd));
searchcmd->fun(sd, str+strlen(cmd));
}
}
else{
fprintf(sd->out,"Unknown command: '%s'\n",cmd);
}
return;
char key[CW_KTV_MAX_KEY_LEN];
char type[128];
char val[2048];
key[0]=0;
type[0]=0;
val[0]=0;
cw_ktv_init_str_reader(&reader,str, strlen(str));
n = cw_ktv_parse_string(&reader, key,type,val);
if (n==-1){
int i;
fprintf(sd->out,"Error on pos %d\n",reader.pos);
fprintf(sd->out,"%s",str);
for(i=0;i<reader.pos;i++){
fprintf(sd->out," ");
}
fprintf(sd->out,"^\n");
fprintf(sd->out,"%s\n",reader.error);
}
else{
fprintf(sd->out,"%s :%s: %s\n", key,type,val);
}
return;
n = sscanf (str, "%s%s", cmd, args);
if (n<=0)
return;
/*printf("CMD: %s, ARGS:\n",cmd);*/
if (strcmp (cmd, "s") == 0) {
show_aps (sd->out);
return;
}
if (strcmp (cmd, "con")==0){
con(sd->out);
return;
}
}
void shell_loop (FILE *file)
{
struct shelldata sd;
int c;
/* setvbuf(file,NULL,_IONBF,0);
fflush(file);
*/
char str[2048];
sd.update_cfg = cw_ktv_create();
sd.out = file;
sprintf(sd.prompt,"%s","*");
do {
fprintf (file, "actube[%s]:>", sd.prompt);
fflush (file);
str[0]=0;
fgets (str, sizeof (str), file);
execute_cmd (&sd, str);
} while (c != EOF);
}
void * run_shell (void * arg)
{
struct sockaddr_storage server, client;
socklen_t client_size;
char sockstr[SOCK_ADDR_BUFSIZE];
int rc;
const char * addr = "127.0.0.1:5000";
int sockfd, clientsock;
int yes;
while(1){
rc = sock_strtoaddr (addr, (struct sockaddr*) &server);
if (! rc) {
cw_log (LOG_ERR, "Can't parse address '%s', %s", addr, strerror (errno));
}
sockfd = socket ( ( (struct sockaddr*) &server)->sa_family, SOCK_STREAM, 0);
yes = 1;
/* reuse address */
setsockopt (sockfd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof (yes));
/* bind address */
rc = bind (sockfd, (struct sockaddr*) &server, sizeof (server));
if (rc) {
cw_log (LOG_ERR, "Can't bind socket address '%s', %s", addr, strerror (errno));
}
rc = listen (sockfd, 5);
if (rc) {
cw_log (LOG_ERR, "Can't listen on address '%s', %s", addr, strerror (errno));
}
client_size = sizeof (client);
clientsock = accept (sockfd, (struct sockaddr*) &client, &client_size);
if (clientsock > 0) {
sock_addr2str_p (&client, sockstr);
cw_dbg (DBG_INFO, "Acceptiong session from %s", sockstr);
printf("New shell lopp\n");
shell_loop (fdopen (clientsock, "a+"));
printf("end shell lopp\n");
close (clientsock);
printf("close clsock\n");
}
cw_dbg (DBG_INFO,"Accepting shell session %i, %s", rc, strerror (errno));
}
return NULL;
}
void start_shell()
{
pthread_t thread;
pthread_create (&thread, NULL, run_shell,
NULL);
}

View File

@ -335,7 +335,7 @@ static int socklist_check_size()
}
int socklist_add_unicast(const char *addr, const char *port, int ac_proto)
int socklist_add_unicast(const char *addr, const char *port, int ac_proto, int ipv4, int ipv6)
{
char sock_buf[SOCK_ADDR_BUFSIZE];
struct addrinfo hints;
@ -364,6 +364,14 @@ int socklist_add_unicast(const char *addr, const char *port, int ac_proto)
struct sockaddr broadcast;
struct sockaddr *sa;
int sockfd;
if (res->ai_addr->sa_family == AF_INET && !ipv4){
continue;
}
if (res->ai_addr->sa_family == AF_INET6 && !ipv6){
continue;
}
ifname[0] = 0;
rc = sock_getifinfo(res->ai_addr, ifname, &broadcast, &netmask);
@ -372,6 +380,7 @@ int socklist_add_unicast(const char *addr, const char *port, int ac_proto)
continue;
}
/* Bind the control port */
sa = res->ai_addr;
sockfd = socket(res->ai_addr->sa_family, SOCK_DGRAM, 0);

View File

@ -40,7 +40,7 @@ struct socklistelem{
extern int socklist_add_multicast(const char * addr, const char * port, int ac_proto);
extern int socklist_add_unicast(const char *addr, const char * port, int ac_proto);
extern int socklist_add_unicast(const char *addr, const char * port, int ac_proto, int ipv4, int ipv6);
extern int socklist_add_broadcast(const char *addr, const char * port,int ac_proto);
extern int socklist_init();
extern void socklist_destroy();

137
src/ac/statemachine.c Normal file
View File

@ -0,0 +1,137 @@
#include <stdint.h>
#include <mavl.h>
#include "cw/capwap.h"
#include "cw/dbg.h"
#include "statemachine.h"
static cw_StateMachineState_t statemachine_states[];
int cw_statemachine_run(struct cw_StateMachine * mach)
{
struct mavl * st = cw_statemachine_load_states(NULL,statemachine_states);
mavl_destroy(st);
return 0;
}
static cw_StateMachineState_t statemachine_states[]={
{ CW_STATE_NONE, CAPWAP_STATE_DISCOVERY, /* transition */
NULL,0 /* timer */
}
,
{
CAPWAP_STATE_DTLS_SETUP, CAPWAP_STATE_JOIN, /* transition */
"wait-join",CAPWAP_WAIT_JOIN, /* timer */
1 /* retval */
}
,
{
CAPWAP_STATE_JOIN,CAPWAP_STATE_TIMEOUT,
NULL,0,
0, "WTP Join timeout"
}
,
{
CAPWAP_STATE_JOIN, CAPWAP_STATE_JOIN,
NULL,0,
1, "WTP has joined"
}
,
{
CAPWAP_STATE_JOIN, CAPWAP_STATE_CONFIGURE,
"capwap-timers/change-state-pending-timer",CAPWAP_TIMER_CHANGE_STATE_PENDING_TIMER,
1, NULL
}
,
{
CAPWAP_STATE_CONFIGURE,CAPWAP_STATE_TIMEOUT,
NULL,0,
0, "WTP change state timeout"
}
,
{
CAPWAP_STATE_CONFIGURE,CAPWAP_STATE_DATA_CHECK,
"capwap-timers/data-check-timer",CAPWAP_TIMER_DATA_CHECK_TIMER,
1, NULL
}
,
{
CAPWAP_STATE_DATA_CHECK,CAPWAP_STATE_TIMEOUT,
NULL,0,
0, "WTP data check timeout"
}
,
{
CAPWAP_STATE_DATA_CHECK,CAPWAP_STATE_RUN,
"capwap-timers/echo-interval",CAPWAP_ECHO_INTERVAL,
1, NULL
}
,
{
CAPWAP_STATE_RUN,CAPWAP_STATE_RUN,
"capwap-timers/echo-interval",CAPWAP_ECHO_INTERVAL,
1, NULL
}
,
{
CAPWAP_STATE_RUN,CAPWAP_STATE_TIMEOUT,
NULL,0,
0, "WTP echo timout"
}
,
{0,0,0}
};
static int cmp_statemachine_state(const void *state1, const void *state2)
{
const struct cw_StateMachineState *s1 = state1;
const struct cw_StateMachineState *s2 = state2;
int rc;
rc = s1->state - s2->state;
if (rc!=0)
return rc;
return s1->prevstate-s2->prevstate;
}
struct mavl * cw_statemachine_load_states (struct mavl * statemachine_states, cw_StateMachineState_t * states)
{
cw_StateMachineState_t * s;
int replaced;
cw_dbg(DBG_STATE,"Loading State Machine States");
if (statemachine_states == NULL){
statemachine_states = mavl_create(cmp_statemachine_state,NULL,sizeof(cw_StateMachineState_t));
if (statemachine_states == NULL)
return NULL;
}
s=states;
while (s->state != 0){
const char * repstr;
mavl_replace(statemachine_states,s,&replaced);
if (replaced){
repstr = "Replacing";
}
else{
repstr = "Adding";
}
cw_dbg(DBG_STATE," %s: [%s->%s]",repstr,
cw_strstate(s->prevstate),
cw_strstate(s->state));
s++;
}
return NULL;
}

13
src/ac/statemachine.h Normal file
View File

@ -0,0 +1,13 @@
#ifndef STATEMACHINE_H
#define STATEMACHINE_H
struct cw_StateMachine{
uint8_t prevstate,currentstate;
};
struct mavl * cw_statemachine_load_states (struct mavl * statemachine_states, cw_StateMachineState_t * states);
int cw_statemachine_run(struct cw_StateMachine * mach);
#endif

View File

@ -71,17 +71,17 @@ void wtplist_destroy()
struct wtpman * wtplist_get(const struct sockaddr * addr)
{
struct conn * conn = connlist_get(connlist,addr);
struct cw_Conn * conn = connlist_get(connlist,addr);
if (!conn)
return 0;
return conn->data;
}
struct wtpman * wtplist_get_by_session_id(bstr16_t *session_id)
struct wtpman * wtplist_get_by_session_id(bstr16_t session_id)
{
struct conn search;
struct conn * conn;
struct cw_Conn search;
struct cw_Conn * conn;
search.session_id = session_id;
/*memcpy (search.session_id, session_id,16);*/

View File

@ -13,7 +13,7 @@ extern struct wtpman * wtplist_add(struct wtpman * wtpman);
extern void wtplist_remove(struct wtpman * wtpman);
extern void wtplist_lock();
extern void wtplist_unlock();
extern struct wtpman * wtplist_get_by_session_id(bstr16_t *session_id);
extern struct wtpman * wtplist_get_by_session_id(bstr16_t session_id);
struct connlist * wtplist_get_connlist(void);
#endif

View File

@ -21,7 +21,7 @@
#include <string.h>
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
#include <unistd.h>
#include "cw/capwap.h"
@ -37,42 +37,13 @@
#include "ac.h"
#include "conf.h"
#include "db.h"
#include "socklist.h"
#include "wtpman.h"
#include "wtplist.h"
#include "cw/ktv.h"
#include "cw/val.h"
#include "actube.h"
static void reset_echointerval_timer(struct wtpman *wtpman)
{
/* char sock_buf[SOCK_ADDR_BUFSIZE];*/
/* uint16_t ct = mbag_get_word(wtpman->conn->local, CW_ITEM_CAPWAP_TIMERS,
CW_MAX_DISCOVERY_INTERVAL << 8 |
CAPWAP_ECHO_INTERVAL);
*/
/* start echinterval timer and put 2 seconds for "safety" on it */
/*
// wtpman->echointerval_timer = cw_timer_start(2+ (ct & 0xff));
// db_ping_wtp(sock_addr2str_p(&wtpman->conn->addr,sock_buf), conf_acname);
// cw_dbg(DBG_X, "Starting capwap timer: %d", wtpman->echointerval_timer);
*/
}
static int msg_start_handler(struct conn *conn, struct cw_action_in *a, uint8_t * data,
int len, struct sockaddr *from)
{
struct wtpman *wtpman = conn->data;
reset_echointerval_timer(wtpman);
return 0;
}
static void wtpman_remove(struct wtpman *wtpman)
{
@ -86,6 +57,7 @@ static void wtpman_remove(struct wtpman *wtpman)
static void wtpman_run_discovery(void *arg)
{
struct wtpman *wtpman = (struct wtpman *) arg;
time_t timer = cw_timer_start(10);
@ -97,40 +69,27 @@ static void wtpman_run_discovery(void *arg)
&& wtpman->conn->capwap_state == CAPWAP_STATE_DISCOVERY) {
int rc;
rc = cw_read_messages(wtpman->conn);
if (cw_result_is_ok(rc)){
wtpman->conn->capwap_state=CAPWAP_STATE_JOIN;
cw_dbg(DBG_INFO,"Discovery has detected mods: %s %s",
wtpman->conn->cmod->name,wtpman->conn->bmod->name);
if (cw_result_is_ok(rc)) {
wtpman->conn->capwap_state = CAPWAP_STATE_JOIN;
cw_dbg(DBG_INFO, "Discovery has detected mods: %s %s",
wtpman->conn->cmod->name,
wtpman->conn->bmod->name);
wtplist_lock();
discovery_cache_add(discovery_cache,(struct sockaddr*)&wtpman->conn->addr,
wtpman->conn->cmod,wtpman->conn->bmod);
discovery_cache_add(discovery_cache,
(struct sockaddr *) &wtpman->conn->
addr, wtpman->conn->cmod,
wtpman->conn->bmod);
wtplist_unlock();
}
}
return;
}
/*
int xprocess_message(struct conn *conn, uint8_t * rawmsg, int rawlen,
struct sockaddr *from)
{
uint8_t *msgptr = rawmsg + cw_get_hdr_msg_offset(rawmsg);
uint32_t type = cw_get_msg_type(msgptr);
cw_log(LOG_ERR, "Hey: %d", type);
if (type == CAPWAP_MSG_DISCOVERY_REQUEST)
conn->capwap_state = CAPWAP_STATE_DISCOVERY;
return process_message(conn, rawmsg, rawlen, from);
}
*/
static int wtpman_dtls_setup(void *arg)
{
char cipherstr[512];
@ -141,42 +100,47 @@ static int wtpman_dtls_setup(void *arg)
/* try to accept the connection */
if (!dtls_accept(wtpman->conn)) {
cw_dbg(DBG_DTLS, "Error establishing DTLS session with %s",
sock_addr2str_p(&wtpman->conn->addr,sock_buf));
sock_addr2str_p(&wtpman->conn->addr, sock_buf));
return 0;
}
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));
return 1;
}
/*
static int wtpman_join(void *arg)
{
int rc;
char sock_buf[SOCK_ADDR_BUFSIZE];
struct wtpman *wtpman = (struct wtpman *) arg;
struct conn *conn = wtpman->conn;
struct cw_Conn *conn = wtpman->conn;
time_t timer, wait_join;
cw_dbg(DBG_INFO, "Join State - %s", sock_addr2str(&conn->addr,sock_buf));
wait_join = cw_ktv_get_word(conn->global_cfg,"wait-join",CAPWAP_WAIT_JOIN);
cw_dbg(DBG_INFO, "Join State - %s",
sock_addr2str(&conn->addr, sock_buf));
wait_join =
cw_ktv_get_word(conn->global_cfg, "wait-join", CAPWAP_WAIT_JOIN);
timer = cw_timer_start(wait_join);
while (!cw_timer_timeout(timer) && wtpman->conn->capwap_state == CAPWAP_STATE_JOIN) {
while (!cw_timer_timeout(timer)
&& wtpman->conn->capwap_state == CAPWAP_STATE_JOIN) {
rc = cw_read_messages(wtpman->conn);
if (rc < 0) {
if (errno == EAGAIN)
continue;
break;
}
cw_dbg_ktv_dump(conn->remote_cfg,DBG_INFO,
"-------------dump------------",
"DMP","---------end dump --------");
cw_dbg_ktv_dump(conn->remote_cfg, DBG_INFO,
"-------------dump------------",
"DMP", "---------end dump --------");
}
if (rc != 0) {
@ -186,8 +150,9 @@ static int wtpman_join(void *arg)
if (wtpman->conn->capwap_state != CAPWAP_STATE_JOIN_COMPLETE) {
cw_dbg(DBG_MSG_ERR, "No join request from %s after %d seconds, WTP died.",
sock_addr2str(&wtpman->conn->addr,sock_buf), wait_join);
cw_dbg(DBG_MSG_ERR,
"No join request from %s after %d seconds, WTP died.",
sock_addr2str(&wtpman->conn->addr, sock_buf), wait_join);
return 0;
}
@ -197,11 +162,14 @@ static int wtpman_join(void *arg)
}
*/
static void wtpman_image_data(struct wtpman *wtpman)
void wtpman_image_data(struct wtpman *wtpman)
{
/* char sock_buf[SOCK_ADDR_BUFSIZE];
struct conn *conn = wtpman->conn;
struct cw_Conn *conn = wtpman->conn;
// Image upload
const char *filename = mbag_get_str(conn->outgoing, CW_ITEM_IMAGE_FILENAME, NULL);
@ -257,13 +225,13 @@ static void wtpman_image_data(struct wtpman *wtpman)
void * wtpman_run_data(void *wtpman_arg)
void *wtpman_run_data(void *wtpman_arg)
{
return NULL;
/*
struct wtpman *wtpman = (struct wtpman *) wtpman_arg;
struct conn *conn = wtpman->conn;
struct cw_Conn *conn = wtpman->conn;
uint8_t data[1001];
@ -279,44 +247,49 @@ void * wtpman_run_data(void *wtpman_arg)
}
int cw_run_state_machine(struct conn * conn, time_t *timer)
int cw_run_state_machine(struct cw_Conn *conn, time_t * timer)
{
int timerval;
cw_StateMachineState_t search, *result;
while(1){
while (1) {
search.state = conn->capwap_state;
search.prevstate = conn->capwap_prevstate;
result = mavl_get(conn->msgset->state_machine,&search);
cw_dbg(DBG_STATE,"State transition: [%s -> %s]",
cw_strstate(conn->capwap_prevstate),
cw_strstate(conn->capwap_state)
);
if (result == NULL){
cw_log(LOG_ERR,"State not found");
result = mavl_get(conn->msgset->statemachine_states, &search);
cw_dbg(DBG_STATE, "State transition: [%s -> %s]",
cw_strstate(conn->capwap_prevstate),
cw_strstate(conn->capwap_state)
);
if (result == NULL) {
cw_log(LOG_ERR, "State not found");
return 0;
}
if (result->jump_state){
if (result->jump_state) {
conn->capwap_state = result->jump_state;
conn->capwap_prevstate = result->jump_prevstate;
cw_dbg(DBG_STATE,"Jump to state: [%s->%s]",
cw_strstate(conn->capwap_prevstate),
cw_strstate(conn->capwap_state));
cw_dbg(DBG_STATE, "Jump to state: [%s->%s]",
cw_strstate(conn->capwap_prevstate),
cw_strstate(conn->capwap_state));
continue;
}
if (result->dbgmsg){
cw_dbg(DBG_STATE,"%s",result->dbgmsg);
if (result->dbgmsg) {
cw_dbg(DBG_STATE, "%s", result->dbgmsg);
}
if (result->timer_key){
timerval = cw_ktv_get_word(conn->local_cfg,result->timer_key,result->timer_default);
if (result->timer_key) {
timerval =
cw_cfg_get_word(conn->local_cfg, result->timer_key,
result->timer_default);
*timer = cw_timer_start(timerval);
cw_dbg(DBG_STATE,"Starting timer: [%s] - %d seconds.",result->timer_key,timerval);
cw_dbg(DBG_STATE, "Starting timer: [%s] - %d seconds.",
result->timer_key, timerval);
}
return result->retval;
}
@ -325,26 +298,25 @@ int cw_run_state_machine(struct conn * conn, time_t *timer)
/*#define CW_TRANSITION(prestate,state) (prestate<<16|state)*/
static void * wtpman_main(void *arg)
static void *wtpman_main(void *arg)
{
mavl_t r;
int rc ;
//mavl_t r;
int rc;
time_t timer;
char sock_buf[SOCK_ADDR_BUFSIZE];
struct conn *conn;
int last_state;
//char sock_buf[SOCK_ADDR_BUFSIZE];
struct cw_Conn *conn;
// int last_state;
struct wtpman *wtpman = (struct wtpman *) arg;
wtpman->conn->seqnum = 0;
conn = wtpman->conn;
wtpman->conn->remote_cfg = cw_ktv_create();
// wtpman->conn->remote_cfg = cw_cfg_create();
/* We were invoked with an unencrypted packet,
* so assume, it is a discovery request */
if (!wtpman->dtlsmode){
if (!wtpman->dtlsmode) {
/* We were invoked with an unencrypted packet,
* so assume, it is a discovery request */
wtpman_run_discovery(arg);
wtpman_remove(wtpman);
return NULL;
@ -353,119 +325,41 @@ static void * wtpman_main(void *arg)
/* reject connections to our multi- or broadcast sockets */
if (socklist[wtpman->socklistindex].type != SOCKLIST_UNICAST_SOCKET) {
cw_dbg(DBG_DTLS,"Reject multi");
cw_dbg(DBG_DTLS, "Reject multi");
wtpman_remove(wtpman);
return NULL;
}
conn->capwap_state = CAPWAP_STATE_DTLS_SETUP;
/* establish dtls session */
if (!wtpman_dtls_setup(wtpman)) {
wtpman_remove(wtpman);
return NULL;
}
/*last_state = conn->capwap_state;
conn->capwap_state = CAPWAP_STATE_JOIN;
*/
conn->capwap_state = CAPWAP_STATE_JOIN;
*/
conn->capwap_prevstate = CAPWAP_STATE_DTLS_SETUP;
conn->capwap_state = CAPWAP_STATE_JOIN;
rc = 0;
while (1){
int wait_join;
int wait_change_state;
if (!cw_run_state_machine(conn, &timer)){
cw_dbg(DBG_INFO,"WTP died");
wtpman_remove(wtpman);
return NULL;
while (1) {
//int wait_join;
//int wait_change_state;
if (!cw_run_state_machine(conn, &timer)) {
cw_dbg(DBG_INFO, "WTP died");
wtpman_remove(wtpman);
return NULL;
};
/*
switch (conn->capwap_transition){
case CW_TRANSITION(CAPWAP_STATE_DTLS_SETUP, CAPWAP_STATE_JOIN):
{
wait_join = cw_ktv_get_word(conn->global_cfg,"wait-join",CAPWAP_WAIT_JOIN);
timer = cw_timer_start(wait_join);
break;
}
case CW_TRANSITION(CAPWAP_STATE_JOIN, CAPWAP_STATE_JOIN):
{
char wtpname[CAPWAP_MAX_WTP_NAME_LEN];
cw_KTV_t * result;
result = cw_ktv_get(conn->remote_cfg,"wtp-name",NULL);
result->type->to_str(result,wtpname,CAPWAP_MAX_WTP_NAME_LEN);
cw_dbg(DBG_INFO, "WTP joined: '%s', IP %s.",
wtpname,
sock_addr2str(&conn->addr,sock_buf)
);
break;
}
case CW_TRANSITION(CAPWAP_STATE_JOIN,CAPWAP_STATE_TIMEOUT):
{
cw_dbg(DBG_MSG_ERR, "No join request from %s after %d seconds, WTP died.",
sock_addr2str(&wtpman->conn->addr,sock_buf), wait_join);
wtpman_remove(wtpman);
return NULL;
break;
}
case CW_TRANSITION(CAPWAP_STATE_JOIN, CAPWAP_STATE_CONFIGURE):
{
wait_change_state = cw_ktv_get_word(conn->global_cfg,
"capwap-timers/change-state-pending-timer",
CAPWAP_TIMER_CHANGE_STATE_PENDING_TIMER);
break;
}
case CW_TRANSITION(CAPWAP_STATE_CONFIGURE,CAPWAP_STATE_TIMEOUT):
{
cw_dbg(DBG_MSG_ERR, "No Change State Event Request %s after %d seconds, WTP died.",
sock_addr2str(&wtpman->conn->addr,sock_buf), wait_change_state);
wtpman_remove(wtpman);
return NULL;
break;
}
}
*/
while (!cw_timer_timeout(timer)) {
if (conn->update_cfg != NULL){
mavl_t tmp;
tmp = conn->local_cfg;
mavl_merge(conn->default_cfg, conn->local_cfg);
mavl_merge(conn->default_cfg, conn->remote_cfg);
conn->local_cfg=conn->update_cfg;
cw_dbg(DBG_INFO, "Updating WTP %s",sock_addr2str(&conn->addr,sock_buf));
rc = cw_send_request(conn, CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST);
conn->update_cfg=NULL;
conn->local_cfg=tmp;
}
rc = cw_read_messages(wtpman->conn);
if (rc < 0) {
if (errno == EAGAIN)
@ -473,37 +367,37 @@ static void * wtpman_main(void *arg)
}
break;
}
if(rc<0){
if (rc < 0) {
conn->capwap_prevstate = conn->capwap_state;
conn->capwap_state = CAPWAP_STATE_TIMEOUT;
}
}
/* dtls is established, goto join state */
/*
conn->capwap_state = CAPWAP_STATE_JOIN;
if (!wtpman_join(wtpman)) {
wtpman_remove(wtpman);
@ -513,198 +407,128 @@ static void * wtpman_main(void *arg)
cw_dbg(DBG_INFO, "WTP from %s has joined with session id: %s",
sock_addr2str_p(&conn->addr,sock_buf),
format_bin2hex(conn->session_id,16));
sock_addr2str_p(&conn->addr, sock_buf),
format_bin2hex(conn->session_id, 16));
exit(0);
/*
// cw_dbg(DBG_INFO, "Creating data thread");
// pthread_t thread;
// pthread_create(&thread, NULL, (void *) wtpman_run_data, (void *) wtpman);
*/
/* here the WTP has joined, now we assume an image data request
or a configuration status request. Nothing else.
*/
exit(0);
rc = 0;
while (!cw_timer_timeout(timer)
&& wtpman->conn->capwap_state == CAPWAP_STATE_CONFIGURE) {
rc = cw_read_messages(wtpman->conn);
if (rc < 0) {
if (errno != EAGAIN)
break;
}
}
cw_dbg_ktv_dump(conn->remote_cfg,DBG_INFO,"-------------dump------------","DMP","---------end dump --------");
if (!cw_result_is_ok(rc)) {
cw_dbg(DBG_INFO, "WTP Problem: %s", cw_strrc(rc));
wtpman_remove(wtpman);
return NULL;
}
if (conn->capwap_state == CW_STATE_IMAGE_DATA) {
wtpman_image_data(wtpman);
return NULL;
}
conn->capwap_state = CAPWAP_STATE_RUN;
/*
// XXX testing ...
// DBGX("Cofig to sql", "");
// props_to_sql(conn,conn->incomming,0);
// radios_to_sql(conn);
*/
/*conn->msg_end=msg_end_handler;*/
/* The main run loop */
reset_echointerval_timer(wtpman);
rc = 0;
while (wtpman->conn->capwap_state == CAPWAP_STATE_RUN) {
rc = cw_read_messages(wtpman->conn);
if (rc < 0) {
if (errno != EAGAIN)
break;
}
/*// cw_dbg(DBG_X, "Time left: %d",
//*/
/*cw_timer_timeleft(wtpman->echointerval_timer);*/
if (cw_timer_timeout(wtpman->echointerval_timer)) {
cw_dbg(DBG_INFO, "Lost connection to WTP:%s",
sock_addr2str_p(&conn->addr,sock_buf));
break;
}
/*
// mavl_del_all(conn->outgoing);
// conn_clear_upd(conn,1);
// props_to_sql(conn,conn->incomming,0);
// radios_to_sql(conn);
*/
r = db_get_update_tasks(conn, sock_addr2str(&conn->addr,sock_buf));
if (r) {
/*
// if (!conn->outgoing->count)
// continue;
*/
cw_dbg(DBG_INFO, "Updating WTP %s",sock_addr2str(&conn->addr,sock_buf));
rc = cw_send_request(conn, CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST);
/*
// mavl_merge(conn->config, conn->outgoing);
// mavl_destroy(conn->outgoing);
// conn->outgoing = mbag_create();
// props_to_sql(conn,conn->incomming,0);
// radios_to_sql(conn);
// mavl_destroy(r);
*/
}
r = db_get_radio_tasks(conn, sock_addr2str(&conn->addr,sock_buf));
if (r) {
/*
// if (!conn->radios_upd->count)
// continue;
*/
cw_dbg(DBG_INFO, "Updating Radios for %s",sock_addr2str(&conn->addr,sock_buf));
rc = cw_send_request(conn, CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST);
/*
// conn_clear_upd(conn,1);
// mavl_destroy(conn->radios_upd);
// conn->radios_upd=mbag_i_create();
// radios_to_sql(conn);
*/
/*
rc = cw_send_request(conn, CW_MSG_CONFIGURATION_UPDATE_REQUEST);
mavl_merge(conn->config, conn->outgoing);
mavl_destroy(conn->outgoing);
conn->outgoing = mbag_create();
config_to_sql(conn);
radios_to_sql(conn);
mavl_destroy(r);
*/
}
}
db_ping_wtp(sock_addr2str_p(&conn->addr,sock_buf), "");
wtpman_remove(wtpman);
return NULL;
}
static void wtpman_run_dtls(void *arg)
{
char sock_buf[SOCK_ADDR_BUFSIZE];
struct wtpman *wtpman = (struct wtpman *) arg;
/* reject connections to our multi- or broadcast sockets */
if (socklist[wtpman->socklistindex].type != SOCKLIST_UNICAST_SOCKET) {
cw_dbg(DBG_DTLS, "Dropping connection from %s to non-unicast socket.",
sock_addr2str_p(&wtpman->conn->addr,sock_buf));
wtpman_remove(wtpman);
return;
}
/*// time_t timer = cw_timer_start(wtpman->conn->wait_dtls);*/
/* establish dtls session */
if (!wtpman_dtls_setup(wtpman)) {
wtpman_remove(wtpman);
return;
}
wtpman_main(arg);
}
void wtpman_destroy(struct wtpman *wtpman)
{
if (wtpman->conn)
conn_destroy(wtpman->conn);
if (wtpman->wtp_cfg)
cw_cfg_destroy(wtpman->wtp_cfg);
free(wtpman);
}
static void copy(struct cw_ElemHandlerParams * params)
{
// struct wtpman * wtpman;
//struct cw_Conn * conn;
//wtpman = (struct wtpman*)params->conn->data;
//conn = (struct cw_Conn*)params->conn;
struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr, int dtlsmode)
// cw_dbg(DBG_X,"------------- Here is the config we ve got from WTP ---------------- ");
// cw_cfg_dump(params->cfg);
// cw_dbg(DBG_X,"------------- This was the config we ve got from WTP ---------------- ");
// cw_dbg(DBG_X,"Now copying:");
// cw_cfg_copy(params->cfg,conn->local_cfg,0,"");
cw_cfg_copy(params->cfg, params->conn->remote_cfg,DBG_CFG_UPDATES,"GlobalCfg");
// cw_dbg(DBG_X,"Copying done.");
}
static int discovery_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, int elems_len)
{
struct cw_Conn * conn = (struct cw_Conn*)params->conn;
char filename[200];
cw_dbg(DBG_X,"DISCOVERY Callback");
copy(params);
const char * wtpname = cw_cfg_get(conn->remote_cfg,"capwap/wtp-name","default");
sprintf(filename,"wtp-discovery-%s.ckv",wtpname);
cw_cfg_save(filename,params->cfg,NULL);
cw_cfg_clear(params->cfg);
return 0;
}
static int join_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, int elems_len)
{
struct cw_Conn * conn = (struct cw_Conn*)params->conn;
char filename[200];
cw_dbg(DBG_X,"JOIN Callback");
copy(params);
const char * wtpname = cw_cfg_get(conn->remote_cfg,"capwap/wtp-name","default");
sprintf(filename,"wtp-join-%s.ckv",wtpname);
cw_cfg_save(filename,params->cfg,NULL);
cw_cfg_clear(params->cfg);
return 0;
}
static int update_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, int elems_len)
{
struct cw_Conn * conn = (struct cw_Conn*)params->conn;
char filename[200];
cw_dbg(DBG_X,"UPDATE Callback");
copy(params);
const char * wtpname = cw_cfg_get(conn->remote_cfg,"capwap/wtp-name","default");
sprintf(filename,"wtp-status-%s.ckv",wtpname);
cw_cfg_save(filename,params->cfg,NULL);
//stop();
return 0;
}
static int event_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, int elems_len)
{
struct cw_Conn * conn = (struct cw_Conn*)params->conn;
char filename[200];
cw_dbg(DBG_X,"WTP EVENT Callback");
copy(params);
const char * wtpname = cw_cfg_get(conn->remote_cfg,"capwap/wtp-name","default");
sprintf(filename,"wtp-event-%s.ckv",wtpname);
cw_cfg_save(filename,conn->remote_cfg,NULL);
//stop();
return 0;
}
struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
int dtlsmode, cw_Cfg_t * global_cfg)
{
struct sockaddr dbgaddr;
socklen_t dbgaddrl;
int sockfd, replyfd;
char sock_buf[SOCK_ADDR_BUFSIZE];
struct wtpman *wtpman;
wtpman = malloc(sizeof(struct wtpman));
if (!wtpman)
return 0;
memset(wtpman, 0, sizeof(struct wtpman));
if (socklist[socklistindex].type != SOCKLIST_UNICAST_SOCKET) {
@ -712,8 +536,9 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr, int dt
replyfd = socklist_find_reply_socket(srcaddr, port);
if (replyfd == -1) {
cw_log(LOG_ERR, "Can't find reply socket for request from %s",
sock_addr2str(srcaddr,sock_buf));
cw_log(LOG_ERR,
"Can't find reply socket for request from %s",
sock_addr2str(srcaddr, sock_buf));
free(wtpman);
return NULL;
}
@ -721,43 +546,69 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr, int dt
replyfd = socklist[socklistindex].sockfd;
}
sockfd = replyfd; /*//socklist[socklistindex].reply_sockfd;*/
sockfd = replyfd; /*//socklist[socklistindex].reply_sockfd; */
dbgaddrl = sizeof(dbgaddr);
getsockname(sockfd, &dbgaddr, &dbgaddrl);
cw_dbg(DBG_INFO, "Creating wtpman on socket %d, %s:%d", sockfd,
sock_addr2str(&dbgaddr,sock_buf), sock_getport(&dbgaddr));
sock_addr2str(&dbgaddr, sock_buf), sock_getport(&dbgaddr));
memset(wtpman, 0, sizeof(struct wtpman));
wtpman->conn = conn_create(sockfd, srcaddr, 100);
wtpman->conn->role = CW_ROLE_AC;
wtpman->conn->data_sock = socklist[socklistindex].data_sockfd;
sock_copyaddr(&wtpman->conn->data_addr, (struct sockaddr *) &wtpman->conn->addr);
wtpman->global_cfg = global_cfg;
wtpman->conn = cw_conn_create(sockfd, srcaddr, 100);
if (!wtpman->conn) {
wtpman_destroy(wtpman);
return NULL;
}
wtpman->conn->global_cfg = global_cfg;
wtpman->conn->local_cfg = cw_cfg_create();
wtpman->wtp_cfg = cw_cfg_create();
wtpman->conn->role = CW_ROLE_AC;
wtpman->conn->data=wtpman;
wtpman->conn->cfg_list[0]=wtpman->conn->update_cfg;
wtpman->conn->cfg_list[1]=wtpman->conn->remote_cfg;
wtpman->conn->cfg_list[2]=wtpman->conn->local_cfg;
wtpman->conn->cfg_list[3]=wtpman->conn->global_cfg;
wtpman->conn->cfg_list[4]=NULL;
wtpman->conn->data_sock = socklist[socklistindex].data_sockfd;
sock_copyaddr(&wtpman->conn->data_addr,
(struct sockaddr *) &wtpman->conn->addr);
cw_conn_set_msg_cb(wtpman->conn,
CAPWAP_MSG_DISCOVERY_REQUEST,
discovery_cb);
cw_conn_set_msg_cb(wtpman->conn,
CAPWAP_MSG_JOIN_REQUEST,
join_cb);
cw_conn_set_msg_cb(wtpman->conn,
CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST,
update_cb);
cw_conn_set_msg_cb(wtpman->conn,
CAPWAP_MSG_WTP_EVENT_REQUEST,
event_cb);
wtpman->conn->mods = conf_mods;
// wtpman->conn->mods = conf_mods;
wtpman->conn->strict_capwap = conf_strict_capwap;
wtpman->conn->strict_hdr = conf_strict_headers;
// wtpman->conn->setup_complete = setup_complete;
/*
// wtpman->conn->radios = mbag_i_create();
// wtpman->conn->radios_upd = mbag_i_create();
@ -768,45 +619,46 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr, int dt
*/
wtpman->conn->local_cfg = cw_ktv_create();
wtpman->conn->global_cfg = actube_global_cfg;
wtpman->conn->local_cfg = actube_global_cfg;
/* when created caused by a packet in DTLS mode, we try
* to find out the modules to load, for detected connection
* from discovery request */
if (dtlsmode){
if (dtlsmode) {
int rc;
struct cw_Mod *cmod, *bmod;
rc = discovery_cache_get(discovery_cache,srcaddr,&cmod,&bmod);
if (rc){
cw_dbg(DBG_INFO, "Initializing with mod %s %s",cmod->name,bmod->name);
wtpman->conn->msgset = cw_mod_get_msg_set(wtpman->conn,cmod,bmod);
wtpman->conn->detected=1;
rc = discovery_cache_get(discovery_cache, srcaddr, &cmod,
&bmod);
if (rc) {
cw_dbg(DBG_INFO, "Initializing with mod %s %s",
cmod->name, bmod->name);
wtpman->conn->msgset =
cw_mod_get_msg_set(wtpman->conn, cmod, bmod);
wtpman->conn->detected = 1;
cmod->setup_cfg(wtpman->conn);
// if (wtpman->conn->setup_complete)
// wtpman->conn->setup_complete(wtpman->conn);
}
}
cw_dbg(DBG_X,"WTPMAN_CREATED: %p",wtpman);
return wtpman;
}
void wtpman_addpacket(struct wtpman *wtpman, uint8_t * packet, int len)
{
// cw_dbg(DBG_X,"ADD PACKET DETECTED %d",wtpman->conn->detected);
conn_q_add_packet(wtpman->conn, packet, len);
}
void wtpman_start(struct wtpman *wtpman, int dtlsmode)
{
cw_dbg(DBG_INFO, "Starting wtpman, DTLS mode = %d",dtlsmode);
wtpman->dtlsmode=dtlsmode;
pthread_create(&wtpman->thread, NULL, wtpman_main,
(void *) wtpman);
cw_dbg(DBG_INFO, "Starting wtpman, DTLS mode = %d", dtlsmode);
wtpman->dtlsmode = dtlsmode;
pthread_create(&wtpman->thread, NULL, wtpman_main, (void *) wtpman);
return;
}

View File

@ -8,19 +8,21 @@
#include "cw/capwap.h"
#include "cw/fragman.h"
#include "cw/timer.h"
#include "cw/cfg.h"
#include "cw/capwap.h"
#define WTPMAN_QSIZE 1024
struct wtpman{
struct wtpman {
pthread_t thread;
struct conn * conn;
struct cw_Conn *conn;
/* wtp data */
uint8_t * wtp_name;
uint8_t * wtp_location;
uint8_t * session_id;
uint8_t *wtp_name;
uint8_t *wtp_location;
uint8_t *session_id;
uint8_t wtp_mactype;
int socklistindex;
@ -28,8 +30,17 @@ struct wtpman{
int dtlsmode;
cw_timer_t echointerval_timer;
cw_timer_t echointerval_timer;
cw_Cfg_t * global_cfg; /**< contains the cfg of AC,
visible to all wtpman threads.
The global cfg was initally read
from a .ckv file on startup.
*/
cw_Cfg_t * wtp_cfg;
};
@ -43,13 +54,14 @@ struct wtp{
//extern void wtpman_run(void *arg);
*/
struct wtpman * wtpman_create();
struct wtpman *wtpman_create();
struct wtpman * wtpman_create(int socklistindex,struct sockaddr * srcaddr, int dtlsmode);
struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
int dtlsmode, cw_Cfg_t * global_cfg);
extern void wtpman_addpacket(struct wtpman * wtpman,uint8_t *packet,int len);
extern void wtpman_destroy(struct wtpman * wtpman);
extern void wtpman_start(struct wtpman * wtpman,int dtlsmode);
extern void wtpman_addpacket(struct wtpman *wtpman, uint8_t * packet, int len);
extern void wtpman_destroy(struct wtpman *wtpman);
extern void wtpman_start(struct wtpman *wtpman, int dtlsmode);

10
src/contrib/install_libmavl.sh Executable file
View File

@ -0,0 +1,10 @@
#!/bin/sh
VERSION="1.2.0"
wget -O libmavl-${VERSION}.tgz ftp://ftp.planix.org/pub/planix/libmavl-${VERSION}.tgz
tar xzvf libmavl-${VERSION}.tgz
cd libmavl-${VERSION}
cp ../libmavl-LocalDefs.mak .
make install

View File

@ -0,0 +1,19 @@
#!/bin/sh
VERSION="1.1.1f"
#VERSION="1.0.1l"
#VERSION="1.0.2"
if [ ! -e openssl-${VERSION}.tar.gz ]
then
wget https://www.openssl.org/source/openssl-${VERSION}.tar.gz
fi
tar xzvf openssl-${VERSION}.tar.gz
#patch -p0 -i openssl-${VERSION}_cisco.patch
cd openssl-${VERSION}
./config
make -j16

View File

@ -0,0 +1,7 @@
include ../../Defs.mak
PREFIX=../../..
INSTALL_LIB_DIR := /lib/$(KERNEL)/$(ARCH)
INSTALL_INCLUDE_DIR := /include
CFLAGS+=-fPIC

View File

@ -1743,7 +1743,7 @@ RTF_EXTENSIONS_FILE =
# classes and files.
# The default value is: NO.
GENERATE_MAN = NO
GENERATE_MAN = YES
# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
@ -1770,7 +1770,7 @@ MAN_EXTENSION = .3
# The default value is: NO.
# This tag requires that the tag GENERATE_MAN is set to YES.
MAN_LINKS = NO
MAN_LINKS = YES
#---------------------------------------------------------------------------
# Configuration options related to the XML output

View File

@ -1,43 +1,9 @@
include ../Defs.mak
include ../CWConfig.mak
-include ../Config.local.mak
include ../Macros.mak
LIBDIR := ../../lib
LIBARCHDIR := $(LIBDIR)/$(ARCH)
OBJDIR := ../../obj/cw/$(ARCH)
SNAME := $(LIBARCHDIR)/libcw.a
DNAME := $(LIBARCHDIR)/libcw.so
LIBS=
ifeq ($(WITH_OPENSSL),1)
CFLAGS+=$(OPENSSL_CFLAGS)
CFLAGS+=-DWITH_OPENSSL
DTLSSRC += dtls_openssl.c \
dtls_openssl_accept.c \
dtls_openssl_connect.c \
dtls_openssl_get_cipher.c \
dtls_openssl_bio.c
LIBS+=-lssl
endif
ifeq ($(WITH_GNUTLS),1)
CFLAGS+=$(GNUTLS_CFLAGS)
CFLAGS+=-DWITH_GNUTLS
DTLSSRC+= dtls_gnutls.c \
dtls_gnutls_accept.c \
dtls_gnutls_connect.c \
dtls_gnutls_bio.c \
dtls_gnutls_get_cipher.c \
dtls_gnutls_get_peers_cert.c
LIBS+=-lgnutls
endif
MFDEPS=../Defs.mak
CWSRC=\
cw.c\
cw_check_missing_mand.c\
cw_clock_lap.c\
cw_dbg_elem.c\
@ -51,15 +17,7 @@ CWSRC=\
cw_in_ac_name_with_priority.c\
cw_in_capwap_local_ipv4_address.c\
cw_in_capwap_local_ipv6_address.c\
cw_in_check_cfg_update_req.c\
cw_in_check_disc_req.c\
cw_in_check_img_data_req_ac.c\
cw_in_check_img_data_req_wtp.c\
cw_in_check_join_req.c\
cw_in_check_join_resp.c\
cw_in_generic.c\
cw_in_generic_with_index.c\
cw_in_generic_struct.c\
cw_in_radio_generic_struct.c\
cw_in_idx_generic.c\
cw_in_idx_generic_struct.c\
@ -73,15 +31,12 @@ CWSRC=\
cw_in_wtp_reboot_statistics.c\
cw_is_printable.c\
cw_load_file.c\
cw_out_generic.c\
cw_out_generic_with_index.c\
cw_out_radio_administrative_states.c\
cw_process_element.c\
cw_put_elem_radio_administrative_state.c\
cw_put_elem_radio_operational_state.c\
cw_put_image_data.c\
cw_put_local_ip_address.c\
cw_put_msg.c\
cw_radio_set_admin_state.c\
cw_rand.c\
cw_randint.c\
@ -98,47 +53,68 @@ CWSRC=\
cw_strlist_get_id.c\
cw_strlist_get_str.c\
cw_type_bstr16.c\
cw_type_bwstr.c\
cw_type_byte.c\
cw_type_bool.c\
cw_type_str.c\
cw_type_dword.c\
cw_type_struct.c\
cw_type_ipaddress.c\
cw_type_word.c\
cw_type_sysptr.c\
cw_write_descriptor_subelem.c\
cw_read_from.c \
cw_write_radio_element.c\
cw_detect_nat.c\
cw_read_from.c \
cw_in_generic_struct.c\
# cw_in_check_disc_req.c\
# cw_in_check_img_data_req_ac.c\
# cw_in_check_img_data_req_wtp.c\
# cw_in_check_join_req.c\
# cw_in_check_join_resp.c\
# cw_in_generic.c\
# cw_out_generic.c\
#
# cw_process_element.c\
KTVSRC=\
cw_ktv_add.c\
cw_ktv_cast.c\
cw_ktv_replace.c\
cfg.c\
# cw_ktv_add.c\
cw_ktv_idx_get.c\
cw_ktv_mavlcmp.c\
cw_ktv_mavlcmp_type_by_name.c\
cw_ktv_mavldel.c\
# cw_ktv_parser.c\
# cw_ktv_del_sub.c\
# cw_ktv_base_exists.c\
cw_ktv_add_from_str.c\
cw_ktv_get_byte.c\
cw_ktv_read_file.c\
cw_ktv_readline.c\
cw_ktv_save.c\
cw_ktv_std_types.c\
cw_ktv_read_struct.c\
cw_ktv_write_struct.c\
# cw_ktv_get_byte.c\
cw_ktv_get_bool.c\
cw_ktv_get_bstr16.c\
cw_ktv_set_byte.c\
cw_ktv_set_word.c\
cw_ktv_set_dword.c\
cw_ktv_get.c\
cw_ktv_get_word.c\
# cw_ktv_get_word.c\
cw_ktv_get_dword.c\
cw_ktv_get_sysptr.c\
cw_ktv_get_str.c\
cw_ktv_parser.c\
cw_ktv_idx_get.c\
cw_ktv_mavlcmp.c\
cw_ktv_mavlcmp_type_by_name.c\
cw_ktv_mavldel.c\
cw_ktv_read_file.c\
cw_ktv_readline.c\
cw_ktv_read_struct.c\
cw_ktv_write_struct.c\
cw_ktv_std_types.c\
cw_ktv_base_exists.c\
cw_ktv_save.c\
cw_ktv_del_sub.c\
# cw_ktv_cast.c\
cw_ktv_replace.c\
cw_ktv_get.c\
LWSRC=\
@ -156,32 +132,6 @@ LWSRC=\
lw_put_sockaddr.c\
lw_readelem_wtp_name.c\
MAVLSRC=\
mavl_add.c\
mavl_add_ptr.c\
mavl_cmpstr.c\
mavl_create.c\
mavl_del_all.c\
mavl_del.c\
mavl_destroy.c\
mavl_foreach.c\
mavl_foreach_lr.c\
mavl_freeptr.c\
mavl_get.c\
mavl_get_ext.c\
mavl_get_node.c\
mavl_get_node_cmp..c\
mavl_get_ptr.c\
mavliter_get.c\
mavliter_get_ptr.c\
mavliter_init.c\
mavliter_next.c\
mavliter_seek.c\
mavliter_seek_set.c\
mavl_merge.c\
mavl_replace.c\
mavl_replace_data.c\
MLISTSRC=\
mlist_append.c\
@ -227,7 +177,6 @@ MISCSRC=\
bstr_create.c\
bstr_create_from_str.c\
bstr_replace.c\
bstrv_create.c\
capwap_inline.c\
capwap_strings_board.c\
capwap_strings_elem80211.c\
@ -236,34 +185,43 @@ MISCSRC=\
capwap_strings_result.c\
capwap_strings_state.c\
capwap_strings_vendor.c\
conn_create.c\
conn_create_noq.c\
conn_destroy.c\
conn_init.c\
connlist.c\
conn_prepare_image_data_request.c\
conn_process_packet.c\
conn_q_add_packet.c\
conn_q_get_packet.c\
conn_q_wait_packet.c\
conn_q_recv_packet.c\
conn_recv_packet.c\
conn_send_data_packet.c\
conn_send_msg.c\
conn_send_packet.c\
conn_send_request.c\
dot11.c\
dot11_inline.c\
format.c\
format_is_utf8.c\
fragman.c\
intavltree.c\
md5sum.c\
mod.c\
msgset.c\
netconn.c\
send.c\
strheap.c\
netconn.c\
conn.c \
val.c \
discovery.c\
message.c\
cw_out_radio_generic_struct.c\
# intavltree.c\
# conn_q_wait_packet.c\
# conn_init.c\
# conn_create.c\
# conn_send_request.c\
# cw_put_msg.c\
# conn_process_packet.c\
# conn_destroy.c\
DTLSSRC+=\
dtls_bio.c\
@ -271,64 +229,59 @@ DTLSSRC+=\
RADIOSRC=\
cw_out_radio_generic.c\
cw_out_radio_generic_struct.c\
cw_read_radio_generic.c\
# cw_in_radio_generic.c\
# cw_out_radio_generic.c\
MAVLSRC=\
mavl_get_ptr.c\
mavl_insert_ptr.c\
mavl_replace.c\
mavliter_get_ptr.c\
mavl_cmpstr.c\
mavl_freeptr.c \
mavl_merge.c\
DTLSSRC += dtls_openssl.c \
dtls_openssl_accept.c \
dtls_openssl_connect.c \
dtls_openssl_get_cipher.c \
dtls_openssl_bio.c
LIBS=
#DTLSSRC+= dtls_gnutls.c \
# dtls_gnutls_accept.c \
# dtls_gnutls_connect.c \
# dtls_gnutls_bio.c \
# dtls_gnutls_get_cipher.c \
# dtls_gnutls_get_peers_cert.c
#LIBS+=-lgnutls
#SRC=$(wildcard *.c)
SRC = $(CWSRC) $(LWSRC) $(MAVLSRC) $(MLISTSRC) $(SOCKSRC) $(LOGSRC) $(DTLSSRC) $(RADIOSRC) $(KTVSRC) $(MISCSRC)
OBJS=$(patsubst %.c,%.o,$(SRC))
OBJS:=$(patsubst %.o,$(OBJDIR)/%.o,$(OBJS))
all: $(SNAME) $(DNAME)
CFLAGS += $(GNUTLS_CFLAGS) \
-DWITH_CW_LOG \
-DWITH_CW_LOG_DEBUG \
-DWITH_DTLS
$(OBJDIR)/%.o:%.c
@mkdir -p $(OBJDIR)
@echo " $(CC) "$<
@$(CC) -c $(CFLAGS) $< -o $@
$(SNAME) : $(OBJS)
@mkdir -p $(LIBARCHDIR)
@echo " $(AR) $(SNAME)"
@$(AR) rcs $(SNAME) $(OBJS)
$(DNAME) : $(OBJS)
@mkdir -p $(LIBARCHDIR)
@echo " $(LD) $(DNAME)"
@$(LD) $(LDFLAGS) -shared -o $(DNAME) $(OBJS) $(LIBS)
SRCS = $(OBJS:.o=.c)
DEPS := $(OBJS:.o=.d)
.PHONY: deps clean clean_libs libs
SOURCES = $(CWSRC) $(LWSRC) $(MAVLSRC) $(MLISTSRC) $(SOCKSRC) \
$(LOGSRC) $(DTLSSRC) $(RADIOSRC) $(KTVSRC) $(MISCSRC)
clean:
$(RM) $(OBJDIR)/*
$(RM) $(DNAME)
$(RM) $(SNAME)
LIBDIR := ../../lib
LIBARCHDIR := $(LIBDIR)/$(KERNEL)/$(ARCH)
OBJDIR := ../../obj/cw/$(KERNEL)/$(ARCH)
SNAME := $(LIBARCHDIR)/libcw.a
DNAME := $(LIBARCHDIR)/libcw.so
CFLAGS+=-fPIC -DUSE_OPENSSL -O0 -I../../include -I/usr/local/include
CFLAGS+=-g
all: $(SNAME) $(DNAME)
static: $(SNAME)
dynamic: $(DNAME)
include ../lib.mk
clean_deps:
$(DEPS)
deps:
echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > .depend
makedepend $(SRC) -f.depend -p$(OBJDIR)/
-include .depend
depend:
mkdep -c ${CFLAGS} ${SOURCES}

View File

@ -25,4 +25,8 @@
#define ANSI_ITALIC "\x1b[3m"
#define ANSI_BOLD "\x1b[1m"
#define ANSI_HOME "[H"
#endif /* __ANSI_COLORS_H */

View File

@ -140,7 +140,7 @@ static inline int bstr16_ncpy(uint8_t *dst,uint8_t*src,uint16_t len)
bstr16_t bstr16_create(const uint8_t *data, uint16_t len);
uint8_t * bstr16_create_from_str(const char *s);
bstr16_t bstr16_create_from_str(const char *s);
extern uint8_t * bstr16_create_from_cfgstr(const char * s);
#define bstr16_replace bstr_replace

View File

@ -2,7 +2,7 @@
#include "format.h"
uint8_t * bstr16_create_from_str(const char *s)
bstr16_t bstr16_create_from_str(const char *s)
{
uint8_t * mem;
int msize;

View File

@ -1,18 +0,0 @@
#include "bstr.h"
/*
uint8_t * bstrv_create(uint32_t vendor_id, uint8_t *data, uint8_t len)
{
uint8_t * str = malloc(bstrv_size(len));
if (!str)
return 0;
bstrv_set_vendor_id(str,vendor_id);
bstrv_set_len(str,len);
memcpy(bstrv_data(str),data,len);
*(bstrv_data(str)+bstrv_len(str))=0;
return str;
}
*/

View File

@ -240,7 +240,7 @@
#define CAPWAP_ELEM_ECN_SUPPORT 53
#define CAPWAP_ELEM_IDLE_TIMEOUT 23
#define CW_ELEM_IMAGE_DATA 24
#define CW_ELEM_IMAGE_IDENTIFIER 25
#define CAPWAP_ELEM_IMAGE_IDENTIFIER 25
#define CW_ELEM_IMAGE_INFORMATION 26
#define CW_ELEM_INITIATE_DOWNLOAD 27
#define CAPWAP_ELEM_LOCATION_DATA 28
@ -394,14 +394,12 @@
//#define CAPWAP_CIPHER "AES128-SHA"
*/
/*
#ifdef WITH_GNUTLS
#define CAPWAP_CIPHER "+RSA:+AES-128-CBC:+SHA1:"
#ifdef USE_OPENSSL
#define CAPWAP_CIPHER "ALL"
#else
#define CAPWAP_CIPHER "+RSA:+AES-128-CBC:+SHA1:"
#endif
#ifdef WITH_OPENSSL
#define CAPWAP_CIPHER "ALL"
#endif
*/
/**
@ -643,14 +641,10 @@ struct cw_ac_status {
*/
enum capwap_states {
CW_STATE_NONE = 0,
/** Discovery State */
CAPWAP_STATE_DISCOVERY,
/** Join State */
CAPWAP_STATE_JOIN,
CAPWAP_STATE_JOIN_COMPLETE,
/** Config State */
CAPWAP_STATE_CONFIGURE,
CAPWAP_STATE_DISCOVERY, /**< Discovery State */
CAPWAP_STATE_JOIN, /**< Join State */
CAPWAP_STATE_JOIN_COMPLETE,
CAPWAP_STATE_CONFIGURE, /**< Config State */
CAPWAP_STATE_DTLS_SETUP, /**< DTLS Setup */
/** Image Data Upload */
CW_STATE_IMAGE_DATA,

View File

@ -83,10 +83,17 @@ enum radioelems {
CW_ELEM80211_WTP_RADIO_CONFIGURATION=1046,
/** IEEE 802.11 WTP Radio Fail Alarm Indication */
CW_ELEM80211_WTP_RADIO_FAIL_ALARM_IDICATION=1047,
/** IEEE 802.11 Radio Information Message Element */
CAPWAP80211_ELEM_WTP_RADIO_INFORMATION = 1048
};
/** IEEE 802.11 Radio Information Message Element */
#define CAPWAP80211_ELEM_WTP_RADIO_INFORMATION 1048
/** IEEE 802.11 Antenna Message element */
#define CAPWAP80211_ELEM_ANTENNA 1025
/**
*@}
*/

View File

@ -32,7 +32,7 @@ struct cw_StrListElem capwap_strings_elem[] = {
{CAPWAP_ELEM_ECN_SUPPORT, "ECN Support"},
{CAPWAP_ELEM_IDLE_TIMEOUT, "Idle Timeout"},
{CW_ELEM_IMAGE_DATA, "Image Data"},
{CW_ELEM_IMAGE_IDENTIFIER, "Image Identifier"},
{CAPWAP_ELEM_IMAGE_IDENTIFIER, "Image Identifier"},
{CW_ELEM_IMAGE_INFORMATION, "Image Information"},
{CW_ELEM_INITIATE_DOWNLOAD, "Initiate Download"},
{CAPWAP_ELEM_LOCATION_DATA, "Location Data"},

View File

@ -2,15 +2,15 @@
#include "capwap.h"
struct cw_StrListElem capwap_strings_state[] = {
{ CAPWAP_STATE_DISCOVERY, "Discovery" },
{ CAPWAP_STATE_JOIN,"Join" },
{ CAPWAP_STATE_RUN,"Run" },
{ CAPWAP_STATE_CONFIGURE,"Configure" },
{ CW_STATE_IMAGE_DATA,"Image Data" },
{ CAPWAP_STATE_DTLS_SETUP, "DTLS Setup" },
{ CAPWAP_STATE_DATA_CHECK, "Data Check" },
{ CAPWAP_STATE_TIMEOUT, "Timeout"},
{ CW_STR_STOP,"Undefined" },
{ CW_STATE_NONE, "None"},
{ CAPWAP_STATE_DISCOVERY, "Discovery" },
{ CAPWAP_STATE_JOIN,"Join" },
{ CAPWAP_STATE_RUN,"Run" },
{ CAPWAP_STATE_CONFIGURE,"Configure" },
{ CW_STATE_IMAGE_DATA,"Image Data" },
{ CAPWAP_STATE_DTLS_SETUP, "DTLS Setup" },
{ CAPWAP_STATE_DATA_CHECK, "Data Check" },
{ CAPWAP_STATE_TIMEOUT, "Timeout"},
{ CW_STR_STOP,"Undefined" },
};

855
src/cw/cfg.c Normal file
View File

@ -0,0 +1,855 @@
#include <string.h>
#include <ctype.h>
#include <mavl.h>
#include "val.h"
#include "cfg.h"
#include "dbg.h"
#include "log.h"
#include "cw.h"
static const char *nextc(const char *s)
{
while (isdigit(*s))
s++;
return s;
}
static int cmp0(const char *s1, const char *s2)
{
const char *d1, *d2;
int i1, i2, i;
d1 = strchr(s1, '.');
if (d1 == NULL)
return strcmp(s1, s2);
d2 = strchr(s2, '.');
if (d2 == NULL)
return strcmp(s1, s2);
if ((d1 - s1) != (d2 - s2))
return strcmp(s1, s2);
if (strncmp(s1, s2, (d1 - s1)) != 0)
return strcmp(s1, s2);
if (isdigit(d1[1])) {
i1 = atoi(d1 + 1);
} else {
return cmp0(d1 + 1, d2 + 1);
}
if (isdigit(d2[1])) {
i2 = atoi(d2 + 1);
} else {
return cmp0(d1 + 1, d2 + 1);
}
i = i1 - i2;
if (i == 0) {
return cmp0(nextc(d1 + 1), nextc(d2 + 1));
}
return i;
}
static int cmp(const void *k1, const void *k2)
{
struct cw_Cfg_entry *e1, *e2;
e1 = (struct cw_Cfg_entry *) k1;
e2 = (struct cw_Cfg_entry *) k2;
return cmp0(e1->key, e2->key);
/* return strcmp(e1->key,e2->key);*/
}
static void del(void *ptr)
{
struct cw_Cfg_entry *e;
e = (struct cw_Cfg_entry *) ptr;
free((void *) e->key);
free((void *) e->val);
}
cw_Cfg_t *cw_cfg_create()
{
cw_Cfg_t * cfg;
cfg = malloc(sizeof(cw_Cfg_t));
if (cfg == NULL)
return NULL;
memset(cfg,0,sizeof(cw_Cfg_t));
cfg->cfg = mavl_create(cmp, del, sizeof(struct cw_Cfg_entry));
if (cfg->cfg==NULL){
cw_cfg_destroy(cfg);
return NULL;
}
return cfg;
}
int cw_cfg_set(cw_Cfg_t * cfg, const char *key, const char *val)
{
cw_dbg(cfg->dbg_level, "%s%s: %s",cfg->dbg_prefix,key,val);
struct cw_Cfg_entry e;
int replaced;
e.key = cw_strdup(key);
if (!e.key)
return 0;
e.val = cw_strdup(val);
if (!e.val) {
free((void *) e.key);
return 0;
}
void *rc = mavl_replace(cfg->cfg, &e, &replaced);
if (!rc) {
del(&e);
return 0;
}
if (!replaced)
return 1;
return -1;
}
const char *cw_cfg_get(cw_Cfg_t * cfg, const char *key, const char *def)
{
struct cw_Cfg_entry e, *r;
e.key = key;
r = mavl_get(cfg->cfg, &e);
if (!r)
return def;
return r->val;
}
const char *cw_cfg_get_l(cw_Cfg_t ** cfg, const char * key, const char *def)
{
int i;
struct cw_Cfg_entry e, *r;
for(i=0; cfg[i]!=NULL; i++){
// cw_dbg(DBG_X,"GET_L IN: %p",cfg[i]);
e.key = key;
r = mavl_get(cfg[i]->cfg, &e);
if (r!=NULL)
return r->val;
}
return def;
}
const char *cw_cfg_get2(cw_Cfg_t *cfg1, cw_Cfg_t *cfg2, const char *key, const char *def)
{
return cw_cfg_get(cfg1, key, cw_cfg_get(cfg2,key,def));
}
bstr16_t cw_cfg_get_bstr16(cw_Cfg_t * cfg, const char * key, const char *def)
{
const char *s;
s = cw_cfg_get(cfg,key,def);
if(s==NULL)
return NULL;
return bstr16_create_from_str(s);
}
int cw_cfg_set_bstr16(cw_Cfg_t * cfg, const char * key, bstr16_t str)
{
CW_TYPE_BSTR16->read(cfg,key,bstr16_data(str),bstr16_len(str),NULL);
return 0;
}
void cw_cfg_dump(cw_Cfg_t * cfg)
{
mavliter_t it;
struct cw_Cfg_entry *e;
mavliter_init(&it, cfg->cfg);
mavliter_foreach(&it) {
e = mavliter_get(&it);
printf("%s: '%s'\n", e->key, e->val);
//cw_dbg(dbglevel,"%s%s :%s: %s",prefix,data->key,type->get_type_name(data), value);
}
}
void cw_cfg_fdump(FILE *f, cw_Cfg_t * cfg)
{
mavliter_t it;
struct cw_Cfg_entry *e;
mavliter_init(&it, cfg->cfg);
mavliter_foreach(&it) {
e = mavliter_get(&it);
fprintf(f,"%s: '%s'\n", e->key, e->val);
}
}
struct parser {
int line;
int pos;
int prevpos;
char error[256];
int quote;
FILE *f;
int (*getc)(struct parser *);
void (*ungetc)(struct parser *);
};
static int get_char(struct parser *p)
{
int c;
c = fgetc(p->f);
p->pos++;
if (c == '\n') {
p->prevpos = p->pos;
p->line++;
p->pos = 0;
}
return c;
}
static void unget_char(struct parser *p, int c)
{
ungetc(c, p->f);
if (c == '\n') {
p->line--;
p->pos = p->prevpos;
} else
p->pos--;
}
static int get_char_q(struct parser *p)
{
int c;
while (1) {
c = get_char(p);
if (c == EOF || c == '\n')
return c;
if (c == '"' && !p->quote) {
p->quote = 1;
continue;
}
if (c == '"' && p->quote) {
p->quote = 0;
continue;
}
break;
}
if (!p->quote)
return c;
if (c != '\\')
return c;
c = get_char(p);
switch (c) {
case EOF:
return c;
case 'n':
return '\n';
case '\\':
return '\\';
case '"':
return '"';
default:
unget_char(p, c);
return '\\';
}
/* We will never reach here */
/* return c; */
}
static int skip_chars(struct parser *p, const char *chars)
{
int c;
while ((c = get_char(p)) != EOF) {
if (strchr(chars, c))
continue;
return c;
}
return c;
}
static int skip_to_chars(struct parser *p, const char *chars)
{
int c;
while ((c = get_char(p)) != EOF) {
if (strchr(chars, c))
return c;
}
return c;
}
static int read_key(struct parser *p, char *key, int max_len)
{
int c, n;
do {
c = skip_chars(p, " \t\n\a\v");
if (c == '#') {
c = skip_to_chars(p, "\n\a");
} else {
break;
}
} while (c != EOF);
unget_char(p, c);
c = get_char_q(p);
n = 0;
while (c != EOF && n < max_len) {
if (!p->quote && !isalnum(c)
&& !strchr("._/-()@#|{}[]\\", c) /*strchr(": \t\n\a",c) */ ) {
unget_char(p, c);
break;
}
key[n] = c;
c = get_char_q(p);
n++;
}
key[n] = 0;
return n;
}
static int skip_to_colon(FILE * f, struct parser *p)
{
int c;
c = skip_chars(p, " \t");
if (c != ':') {
if (c == '\n') {
unget_char(p, c);
sprintf(p->error,
"Error at line %d, pos %d: Unexpected EOL, collon expected.",
p->line, p->pos);
return 0;
}
sprintf(p->error, "Error at line %d, pos %d: Collon expected.",
p->line, p->pos);
return 0;
}
return 1;
}
static int read_val(struct parser *p, char *val, int max_len)
{
int c, n, quote;
if (!skip_to_colon(p->f, p))
return -1;
c = skip_chars(p, " \t");
if (c == '"') {
quote = 1;
c = get_char(p);
} else {
quote = 0;
}
n = 0;
while (c != EOF && n < max_len) {
if (quote && c == '"') {
break;
}
if (c == '\n') {
break;
}
if (quote) {
if (c == '\\') {
c = get_char(p);
switch (c) {
case 'n':
c = '\n';
break;
case '\\':
break;
case '"':
break;
default:
unget_char(p, c);
c = '\\';
}
}
}
val[n++] = c;
c = get_char(p);
}
if (!quote && n > 0) {
while (n > 0) {
if (isspace(val[n - 1]))
n--;
else
break;
}
}
val[n] = 0;
return n;
}
int cw_cfg_read_line(FILE * f, struct parser *p, char *key, char *val)
{
int n;
n = read_key(p, key, CW_CFG_MAX_KEY_LEN);
if (n == 0)
return 1;
if (n == -1) {
return -1;
}
n = read_val(p, val, CW_CFG_MAX_KEY_LEN);
if (n == -1) {
return -1;
}
return 0;
}
int cw_cfg_read_from_file(FILE * f, cw_Cfg_t * cfg)
{
char key[CW_CFG_MAX_KEY_LEN];
char val[2048];
struct parser p;
p.line = 1;
p.pos = 0;
p.prevpos = 0;
p.quote = 0;
p.f = f;
int rc;
int errs = 0;
do {
rc = cw_cfg_read_line(f, &p, key, val);
if (rc == -1) {
fprintf(stderr, "Error: %s\n", p.error);
errs++;
}
if (rc != 0) {
continue;
}
cw_cfg_set(cfg, key, val);
} while (rc == 0);
return errs;
}
int cw_cfg_load(const char *filename, cw_Cfg_t * cfg)
{
int errs;
FILE *f = fopen(filename, "rb");
if (!f)
return errno;
errs = cw_cfg_read_from_file(f, cfg);
fclose(f);
if (errs)
errno = EINVAL;
return errno;
}
int cw_cfg_read_from_string(const char *str, cw_Cfg_t *cfg)
{
int errs;
FILE * f = fmemopen((void*)str,strlen(str),"rb");
if(!f)
return errno;
errs = cw_cfg_read_from_file(f, cfg);
fclose(f);
if (errs)
errno = EINVAL;
return errno;
}
int cw_cfg_write_to_file(FILE *f, cw_Cfg_t * cfg)
{
mavliter_t it;
struct cw_Cfg_entry *e;
mavliter_init(&it, cfg->cfg);
mavliter_foreach(&it) {
int n;
e = mavliter_get(&it);
n=strlen(e->val);
if (n>0)
n-=1;
//printf("Write %s: \"%s\" - %d %d (%02x)\n",e->key,e->val,n,isspace(e->val[n]),e->val[n]);
if(isspace(e->val[0]) || isspace(e->val[n]))
fprintf(f,"%s: \"%s\"\n", e->key, e->val);
else
fprintf(f,"%s: %s\n", e->key, e->val);
//cw_dbg(dbglevel,"%s%s :%s: %s",prefix,data->key,type->get_type_name(data), value);
}
return 0;
}
int cw_cfg_save(const char *filename, cw_Cfg_t *cfg, const char *format, ...)
{
int rc;
FILE *f = fopen(filename, "wb");
if (!f)
return errno;
if (format !=NULL){
va_list args;
va_start(args,format);
vfprintf(f,format,args);
va_end(args);
}
rc = cw_cfg_write_to_file(f, cfg);
fclose(f);
return rc;
}
void cw_cfg_iter_init(cw_Cfg_t * cfg, struct cw_Cfg_iter *cfi, const char *base)
{
struct cw_Cfg_entry search;
search.key = base;
mavliter_init(&(cfi->it), cfg->cfg);
mavliter_seek(&(cfi->it), &search, 0);
cfi->base = base;
}
struct cw_Cfg_entry *cw_cfg_iter_next(struct cw_Cfg_iter *cfi, const char *nnkey)
{
struct cw_Cfg_entry *e;
int bl, kl;
const char *d;
e = mavliter_get(&(cfi->it));
if (e == NULL)
return NULL;
bl = strlen(cfi->base);
kl = strlen(e->key);
if (bl > kl)
return NULL;
if (bl == kl) {
if (strcmp(cfi->base, e->key) != 0)
return NULL;
else {
mavliter_next(&(cfi->it));
return e;
}
}
d = strchr(e->key, '.');
if (d == NULL)
return NULL;
if (d - e->key != bl)
return NULL;
if (strncmp(cfi->base, e->key, bl) != 0)
return NULL;
mavliter_next(&(cfi->it));
return e;
}
int cw_cfg_get_bool(cw_Cfg_t * cfg, const char * key, int def)
{
struct cw_Val v;
const char *s = cw_cfg_get(cfg,key,NULL);
if (s==NULL)
return def;
CW_TYPE_BOOL->from_str(&v,s);
return v.val.boolean;
}
uint8_t cw_cfg_get_byte(cw_Cfg_t * cfg, char *key, uint8_t def)
{
struct cw_Val v;
memset(&v,0,sizeof(struct cw_Val));
const char *s = cw_cfg_get(cfg,key,NULL);
if (s==NULL)
return def;
CW_TYPE_BYTE->from_str(&v,s);
return v.val.byte;
}
uint8_t cw_cfg_get_byte_l(cw_Cfg_t ** cfgs, char *key, uint8_t def)
{
struct cw_Val v;
memset(&v,0,sizeof(struct cw_Val));
const char *s = cw_cfg_get_l(cfgs,key,NULL);
if (s==NULL)
return def;
CW_TYPE_BYTE->from_str(&v,s);
return v.val.byte;
}
uint16_t cw_cfg_get_word(cw_Cfg_t * cfg, const char *key, uint16_t def)
{
struct cw_Val v;
const char *s = cw_cfg_get(cfg,key,NULL);
if (s==NULL)
return def;
CW_TYPE_WORD->from_str(&v,s);
return v.val.word;
}
uint16_t cw_cfg_get_word_l(cw_Cfg_t ** cfg, const char *key, uint16_t def)
{
struct cw_Val v;
const char *s = cw_cfg_get_l(cfg,key,NULL);
if (s==NULL)
return def;
CW_TYPE_WORD->from_str(&v,s);
return v.val.word;
}
/*
int cw_cfg_get_word(cw_Cfg_t * cfg, char *key, const char * def)
{
const char *s;
s=cw_cfg_get(cfg,key,def);
if (s==NULL)
return 0;
}
*/
void cw_cfg_set_int(cw_Cfg_t * cfg, const char * key, int val)
{
char a[128];
sprintf(a,"%d",val);
cw_cfg_set(cfg,key,a);
}
int cw_cfg_get_next_index(cw_Cfg_t * cfg, const char *key)
{
char ikey[CW_CFG_MAX_KEY_LEN];
struct cw_Cfg_entry search, * result;
char *d;
sprintf(ikey,"%s.%d",key,65536);
search.key=ikey;
/*//result = ktvn(ktv,&search);*/
result = mavl_get_last(cfg->cfg,&search);
if (result == NULL){
return 0;
}
d = strchr(result->key,'.');
if (d==NULL){
return 0;
}
if (strncmp(result->key,ikey,d-result->key)!=0)
return 0;
return atoi(d+1)+1;
}
int cw_cfg_set_val(cw_Cfg_t * cfg, const char *key, const struct cw_Type *type, const void * valguard, const uint8_t * data, int len)
{
cw_Val_t mdata, *mresult;
char str[2048];
memset(&mdata,0,sizeof(cw_Val_t));
mdata.type=type;
mdata.valguard=valguard;
mresult = type->get(&mdata,data,len);
if (!mresult){
cw_log(LOG_ERR, "Can't create cfg element for key %s of type %s: %s",
key,type->name, strerror(errno));
free(mdata.key);
return 0;
}
type->to_str(&mdata,str,2048);
cw_cfg_set(cfg,key,str);
if (type->del)
type->del(&mdata);
return 1;
}
//int cw_cfg_put(cw_Cfg_t *cfg, const char *key, const struct cw_Type *type,const void
void cw_cfg_copy(cw_Cfg_t *src, cw_Cfg_t *dst,int dbg_level,const char *dbg_prefix)
{
mavliter_t it;
mavliter_init(&it, src->cfg);
mavliter_foreach(&it) {
int exists;
struct cw_Cfg_entry * old_elem,*e, new_elem;
e = mavliter_get(&it);
new_elem.key = cw_strdup(e->key);
new_elem.val = cw_strdup(e->val);
/* if (1){
const char *ov;
ov = cw_cfg_get(dst,e->key,NULL);
cw_dbg(DBG_X, " REAL OV HERE: %s",ov);
}
*/
old_elem = mavl_insert(dst->cfg,&new_elem,&exists);
/* cw_dbg(DBG_X, "CPY: %s: %s -> %s [%d]",new_elem.key,new_elem.val,old_elem->val,exists);
if (exists){
const char *ov;
ov = cw_cfg_get(dst,e->key,NULL);
cw_dbg(DBG_X, " OV HERE: %s",ov);
}
*/
if (!exists){
cw_dbg(dbg_level, "%s: [undef] -> %s",new_elem.key,new_elem.val);
continue;
}
if (strcmp(new_elem.val,old_elem->val)==0){
free((void*)new_elem.key);
free((void*)new_elem.val);
continue;
}
cw_dbg(dbg_level, "%s: %s -> %s",new_elem.key,old_elem->val,new_elem.val);
// cw_dbg(DBG_X, "Replace: %s: %s (old: %s)",new_elem.key, new_elem.val, old_elem->val);
if(dst->cfg->del){
dst->cfg->del(old_elem);
}
memcpy(old_elem,&new_elem,dst->cfg->data_size);
}
}
void cw_cfg_destroy(cw_Cfg_t *cfg)
{
if (cfg->cfg)
mavl_destroy(cfg->cfg);
free(cfg);
}
void cw_cfg_clear(cw_Cfg_t *cfg)
{
mavl_del_all(cfg->cfg);
}
int cw_cfg_base_exists(cw_Cfg_t * cfg, const char *key)
{
struct cw_Cfg_entry e, *result;
//cw_dbg(DBG_X,"LOOX FOR: %s",key);
e.key=key;
result = mavl_get_first(cfg->cfg,&e);
if (result == NULL)
return 0;
//cw_dbg(DBG_X,"BASEXXX: %s",result->key);
if (strlen(result->key)<strlen(key))
return 0;
//cw_dbg(DBG_X,"BASEXXX1: %d",strlen(key));
if (result->key[strlen(key)]!='/' && result->key[strlen(key)]!='.')
return 0;
//cw_dbg(DBG_X,"BASEXXX2: ");
if (strncmp(result->key,key,strlen(key))==0)
return 1;
cw_dbg(DBG_X,"BASEXXX3: ");
return 0;
}
int cw_cfg_base_exists_l(cw_Cfg_t ** cfgs, const char *key)
{
int i;
for(i=0; cfgs[i]; i++){
if (cw_cfg_base_exists(cfgs[i],key))
return 1;
}
// cw_dbg(DBG_X,"NOX EXISIS: %s in %d",key,i);
return 0;
}
cw_Val_t * cw_cfg_get_val_l(cw_Cfg_t ** cfgs, const char *key, const struct cw_Type *type)
{
const char *s;
cw_Val_t * val;
s = cw_cfg_get_l(cfgs,key,NULL);
val = malloc(sizeof(cw_Val_t));
if (val==NULL)
return NULL;
val->type=type;
val->type->from_str(val,s);
return val;
}

76
src/cw/cfg.h Normal file
View File

@ -0,0 +1,76 @@
#ifndef _CFG_H
#define _CFG_H
#include <mavl.h>
#include "val.h"
#include "bstr.h"
#define CW_CFG_MAX_KEY_LEN 1024
struct cw_Cfg {
struct mavl * cfg;
const char *name;
int dbg_level;
const char *dbg_prefix;
};
typedef struct cw_Cfg cw_Cfg_t;
cw_Cfg_t * cw_cfg_create();
int cw_cfg_set(cw_Cfg_t *cfg,const char *key, const char *val);
void cw_cfg_dump(cw_Cfg_t *cfg);
int cw_cfg_read_from_file(FILE * file, cw_Cfg_t * cfg);
int cw_cfg_load(const char *filename,cw_Cfg_t * cfg);
struct cw_Cfg_entry{
const char *key;
const char *val;
};
struct cw_Cfg_iter{
struct mavliter it;
const char *base;
};
const char * cw_cfg_get(cw_Cfg_t * cfg, const char *key, const char *def);
struct cw_Cfg_entry *cw_cfg_iter_next(struct cw_Cfg_iter *cfi, const char *key);
void cw_cfg_iter_init(cw_Cfg_t * cfg, struct cw_Cfg_iter *cfi, const char *base);
int cw_cfg_get_bool(cw_Cfg_t * cfg, const char * key, int def);
uint16_t cw_cfg_get_word(cw_Cfg_t * cfg, const char *key, uint16_t def);
void cw_cfg_set_int(cw_Cfg_t * cfg, const char * key, int val);
uint8_t cw_cfg_get_byte(cw_Cfg_t * cfg, char *key, uint8_t def);
bstr16_t cw_cfg_get_bstr16(cw_Cfg_t * cfg, const char * key, const char *def);
int cw_cfg_set_bstr16(cw_Cfg_t * cfg, const char * key, bstr16_t str);
int cw_cfg_get_next_index(cw_Cfg_t * cfg, const char *key);
const char *cw_cfg_get_l(cw_Cfg_t ** cfg, const char * key, const char *def);
void cw_cfg_copy(cw_Cfg_t *src, cw_Cfg_t *dst,int dbg_level,const char *dbg_prefix);
void cw_cfg_destroy(cw_Cfg_t *cfg);
void cw_cfg_clear(cw_Cfg_t *cfg);
int cw_cfg_base_exists(cw_Cfg_t * cfg, const char *key);
uint8_t cw_cfg_get_byte_l(cw_Cfg_t ** cfgs, char *key, uint8_t def);
cw_Val_t * cw_cfg_get_val_l(cw_Cfg_t ** cfgs, const char *key, const struct cw_Type *type);
int cw_cfg_base_exists_l(cw_Cfg_t ** cfgs, const char *key);
int cw_cfg_save(const char *filename, cw_Cfg_t *cfg, const char *format, ...);
uint16_t cw_cfg_get_word_l(cw_Cfg_t ** cfg, const char *key, uint16_t def);
void cw_cfg_fdump(FILE *f, cw_Cfg_t * cfg);
int cw_cfg_read_from_string(const char *str, cw_Cfg_t *cfg);
int cw_cfg_set_val(cw_Cfg_t * cfg, const char *key, const struct cw_Type *t, const void * valguard, const uint8_t * data, int len);
#define cw_cfg_get_word2(cfg1,cfg2,key,def) \
cw_cfg_get_word(cfg1,key,cw_cfg_get_word(cfg2,key,def))
#define cw_dget(fun,cfg1,cfg2,key,def)\
fun(cfg1,key,fun(cfg2,key,def))
#endif

View File

@ -1,39 +1,162 @@
/*
This file is part of libcapwap.
#include <string.h>
#include <stdint.h>
libcapwap is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
libcapwap is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Foobar. If not, see <http://www.gnu.org/licenses/>.
*/
#include "conn.h"
#include "capwap.h"
#include "cw.h"
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include "cw.h"
#include "dbg.h"
#include "log.h"
#include "cw_util.h"
#include "capwap.h"
#include "conn.h"
#include "sock.h"
/*#include "stravltree.h"*/
#include "mod.h"
#include "msgset.h"
#include "cw.h"
#include "ktv.h"
#include "dbg.h"
#include "msgset.h"
#include "mavltypes.h"
#include "dtls.h"
struct msg_callback{
int type; /**< message type */
cw_MsgCallbackFun fun;
};
int msg_callback_cmp(const void *v1,const void *v2)
{
struct msg_callback *t1,*t2;
t1=(struct msg_callback*)v1;
t2=(struct msg_callback*)v2;
return t1->type - t2->type;
}
/**
* Basic initialization of a conn object
* @param conn conn object to initialize
*/
void cw_conn_init(struct cw_Conn * conn)
{
memset(conn,0,sizeof(struct cw_Conn ));
conn->retransmit_interval=CAPWAP_RETRANSMIT_INTERVAL;
conn->max_retransmit=CAPWAP_MAX_RETRANSMIT;
conn->wait_dtls=CAPWAP_WAIT_DTLS;
conn->wait_join=CAPWAP_WAIT_JOIN;
conn->mtu_discovery=1;
conn->strict_capwap=1;
conn->process_packet=conn_process_packet;
conn->process_message=process_message;
conn->msg_callbacks = mavl_create(msg_callback_cmp,NULL,sizeof(struct msg_callback));
conn->update_cfg = cw_cfg_create();
conn->remote_cfg = cw_cfg_create();
conn->local_cfg = cw_cfg_create();
conn->cfg_list[0]=NULL;
}
int cw_conn_set_msg_cb(struct cw_Conn *conn, int type, cw_MsgCallbackFun fun)
{
struct msg_callback cb;
int exists;
cb.type = type;
cb.fun = fun;
mavl_insert(conn->msg_callbacks,&cb,&exists);
return 1;
}
cw_MsgCallbackFun cw_conn_get_msg_cb(struct cw_Conn *conn, int type)
{
struct msg_callback cb,*result;
cb.type=type;
result = mavl_get(conn->msg_callbacks,&cb);
if (result == NULL)
return NULL;
return result->fun;
}
/**
* Create a conn object
* @param sock a socket
* @param addr the address associated
* @param qsize size of packet queue
* @return A pointer to the created object
* This function creates a conn obnject with queueing functionality
* for asynchronous operation.
* To create a conn object without queue functionallity use #conn_create_noq.
*/
struct cw_Conn * cw_conn_create(int sock, struct sockaddr * addr, int qsize)
{
struct cw_Conn * conn;
conn = malloc(sizeof (struct cw_Conn ));
if (!conn)
return NULL;
cw_conn_init(conn);
conn->sock=sock;
if (addr)
sock_copyaddr(&conn->addr,addr);
conn->fragman = fragman_create();
if (conn->fragman==NULL){
conn_destroy(conn);
return NULL;
}
conn->qsize=qsize;
if (qsize != 0){
if (!(conn->q=malloc( sizeof(uint8_t *) * qsize))){
conn_destroy(conn);
return NULL;
}
conn->qrpos=-1;
if (sem_init(&conn->q_sem,0,0)!=0){
cw_log(LOG_ERR,"Fatal- Can't init semaphore for conn object: %s",strerror(errno));
conn_destroy(conn);
return NULL;
};
conn->recv_packet=conn_q_recv_packet;
conn->recv_packet_peek=conn_q_recv_packet_peek;
}
else{
conn->recv_packet = conn_recv_packet;
conn->recv_packet_peek = conn_recv_packet_peek;
}
conn->send_packet = conn_send_packet;
/* conn->send_data_packet = conn_send_data_packet;*/
conn->last_seqnum_received=-1;
conn->mtu=1480;
conn->cur_packet=0;
conn->recv_timeout=1;
conn->seqnum=-1;
conn->write = conn->send_packet;
conn->read = conn->recv_packet;
conn->dtls_mtu = 1480;
return conn;
}
@ -42,15 +165,15 @@
/**
* Init response message header
*/
void cw_init_response(struct conn *conn, uint8_t * req)
void cw_init_response(struct cw_Conn *conn, uint8_t * req)
{
uint8_t *buffer;
int shbytes, dhbytes;
uint8_t *msgptr, *dmsgptr;
buffer = conn->resp_buffer;
shbytes = cw_get_hdr_msg_offset(req);
memcpy(buffer, req, shbytes);
cw_set_hdr_rmac(buffer, conn->base_rmac);
@ -69,11 +192,11 @@ void cw_init_response(struct conn *conn, uint8_t * req)
cw_set_msg_flags(dmsgptr, 0);
}
void cw_init_request(struct conn *conn, int msg_id)
void cw_init_request(struct cw_Conn *conn, int msg_id)
{
uint8_t *buffer = conn->req_buffer;
uint8_t *msgptr;
/* zero the first 8 bytes */
cw_set_dword(buffer + 0, 0);
cw_set_dword(buffer + 4, 0);
@ -97,7 +220,7 @@ void cw_init_request(struct conn *conn, int msg_id)
cw_set_msg_elems_len(msgptr, 0);
}
void cw_init_data_msg(struct conn *conn)
void cw_init_data_msg(struct cw_Conn *conn)
{
uint8_t *buffer = conn->req_buffer;
cw_set_dword(buffer + 0, 0);
@ -114,11 +237,11 @@ void cw_init_data_msg(struct conn *conn)
/**
* send a response
*/
int cw_send_response(struct conn *conn, uint8_t * rawmsg, int len)
int cw_send_response(struct cw_Conn *conn, uint8_t * rawmsg, int len)
{
int rc;
cw_init_response(conn, rawmsg);
rc = cw_put_msg(conn, conn->resp_buffer);
rc = cw_compose_message(conn, conn->resp_buffer);
if (!cw_result_is_ok(rc))
return 0;
conn_send_msg(conn, conn->resp_buffer);
@ -135,11 +258,12 @@ int cw_send_response(struct conn *conn, uint8_t * rawmsg, int len)
* @param result_code result code to send
* @return 1
*/
int cw_send_error_response(struct conn *conn, uint8_t * rawmsg, uint32_t result_code)
int cw_send_error_response(struct cw_Conn *conn, uint8_t * rawmsg,
uint32_t result_code)
{
uint8_t *out,*dst;
uint8_t *out, *dst;
int l;
cw_init_response(conn, rawmsg);
out = conn->resp_buffer;
@ -155,36 +279,39 @@ int cw_send_error_response(struct conn *conn, uint8_t * rawmsg, uint32_t result_
}
static struct cw_MsgSet *load_msg_set(struct conn *conn, uint8_t * rawmsg, int len,
int elems_len, struct sockaddr *from)
static struct cw_MsgSet *load_msg_set(struct cw_Conn *conn, uint8_t * rawmsg,
int len, int elems_len,
struct sockaddr *from)
{
char sock_buf[SOCK_ADDR_BUFSIZE];
struct cw_Mod *cmod, *bmod;
cmod =
cw_mod_detect(conn, rawmsg, len, elems_len, from, CW_MOD_MODE_CAPWAP);
cw_mod_detect(conn, rawmsg, len, elems_len, from,
CW_MOD_MODE_CAPWAP);
if (cmod == MOD_NULL) {
cw_dbg(DBG_MSG_ERR,
"Can't find mod to handle connection from %s, discarding message",
sock_addr2str_p(from,sock_buf));
sock_addr2str_p(from, sock_buf));
return NULL;
}
bmod =
cw_mod_detect(conn, rawmsg, len, elems_len, from, CW_MOD_MODE_BINDINGS);
bmod =
cw_mod_detect(conn, rawmsg, len, elems_len, from,
CW_MOD_MODE_BINDINGS);
cw_dbg(DBG_INFO, "Mods deteced: %s,%s", cmod->name, bmod->name);
conn->cmod = cmod;
conn->bmod = bmod;
return cw_mod_get_msg_set(conn,cmod,bmod);
return cw_mod_get_msg_set(conn, cmod, bmod);
}
/*
int cw_in_check_generic(struct conn *conn, struct cw_action_in *a, uint8_t * data,
int cw_in_check_generic(struct cw_Conn *conn, struct cw_action_in *a, uint8_t * data,
int len,struct sockaddr *from)
{
// if (cw_is_request(a->msg_id)){
@ -196,37 +323,21 @@ int cw_in_check_generic(struct conn *conn, struct cw_action_in *a, uint8_t * dat
}
*/
/*
void cw_read_elem(struct cw_ElemHandler * handler, struct conn * conn,
uint8_t * elem_data, int elem_len, struct sockaddr * from){
mavldata_t data, *result;
char str[30];
result = handler->type->get(&data,elem_data,elem_len);
handler->type->to_str(result,str,30);
printf("Read %d-%s: %s %s\n", handler->id, handler->name, handler->key, str);
//mavl_add(conn->remote_cfg
}
*/
static int process_elements(struct conn *conn, uint8_t * rawmsg, int len,
static int process_elements(struct cw_Conn *conn, uint8_t * rawmsg, int len,
struct sockaddr *from)
{
mavl_t mand_found;
mlist_t unrecognized;
struct cw_MsgData search;
struct cw_MsgData * message;
struct cw_MsgData *message;
int result_code;
cw_State_t *ui;
uint8_t *elems_ptr;
uint8_t *elem;
struct cw_ElemHandlerParams params;
char sock_buf[SOCK_ADDR_BUFSIZE]; /**< to hold str from sockaddr2str */
/*struct cw_action_in as, *af, *afm;*/
/*struct cw_action_in as, *af, *afm; */
int offset = cw_get_hdr_msg_offset(rawmsg);
@ -239,11 +350,13 @@ static int process_elements(struct conn *conn, uint8_t * rawmsg, int len,
/* pre-check message */
if (payloadlen - 8 != elems_len) {
//printf ("The elems_len is %d\n",elems_len);
//printf ("The len = %d\n",len);
if (conn->strict_hdr) {
cw_dbg(DBG_MSG_ERR,
"Discarding message from %s, msgelems len=%d, payload len=%d, (Strict CAPWAP) ",
sock_addr2str(&conn->addr,sock_buf), elems_len, payloadlen - 8);
sock_addr2str(&conn->addr, sock_buf), elems_len,
payloadlen - 8);
errno = EAGAIN;
return -1;
}
@ -252,34 +365,41 @@ static int process_elements(struct conn *conn, uint8_t * rawmsg, int len,
if (elems_len < payloadlen - 8) {
cw_dbg(DBG_RFC,
"Packet from from %s has %d bytes of extra data, ignoring.",
sock_addr2str(&conn->addr,sock_buf), payloadlen - 8 - elems_len);
elems_len = len - 8;
sock_addr2str(&conn->addr, sock_buf),
payloadlen - 8 - elems_len);
//elems_len = len - 8;
}
if (elems_len > payloadlen - 8) {
cw_dbg(DBG_RFC,
"Packet from from %s has msgelems len of %d bytes, but has only %d bytes of data, truncating.",
sock_addr2str(&conn->addr, sock_buf), elems_len, payloadlen - 8);
sock_addr2str(&conn->addr, sock_buf), elems_len,
payloadlen - 8);
elems_len = payloadlen - 8;
}
}
/* Detect the connecting AC type */
/* Detect the connecting WTP type */
if (!conn->detected) {
struct cw_MsgSet *set = load_msg_set(conn, rawmsg, len, elems_len, from);
struct cw_MsgSet *set =
load_msg_set(conn, rawmsg, len, elems_len, from);
if (!set) {
/*
//cw_log(LOG_ERR, "Error");
*/
*/
errno = EAGAIN;
return -1;
}
conn->cmod->setup_cfg(conn);
conn->msgset= set;
conn->msgset = set;
conn->detected = 1;
if (conn->setup_complete)
conn->setup_complete(conn);
}
/** debug the received message */
@ -287,30 +407,30 @@ static int process_elements(struct conn *conn, uint8_t * rawmsg, int len,
/* prepare struct for search operation */
search.type = cw_get_msg_id(msg_ptr);
/* Search message */
message = mavl_find(conn->msgset->msgdata,&search);
message = mavl_get(conn->msgset->msgdata, &search);
result_code = 0;
if (!message){
if (!message) {
/* Message is unknown */
if (search.type & 1){
cw_dbg(DBG_MSG_ERR,
"Message type %d [%s] unrecognized, sending response.",
search.type, cw_strmsg(search.type),
cw_strstate(conn->capwap_state));
if (search.type & 1) {
cw_dbg(DBG_MSG_ERR,
"Message type %d [%s] unrecognized, sending response.",
search.type, cw_strmsg(search.type),
cw_strstate(conn->capwap_state));
result_code = CAPWAP_RESULT_MSG_UNRECOGNIZED;
cw_send_error_response(conn, rawmsg, result_code);
errno = EAGAIN;
return -1;
}
cw_dbg(DBG_MSG_ERR,
"Message type %d [%s] unrecognized, discarding.",
search.type, cw_strmsg(search.type),
cw_strstate(conn->capwap_state));
cw_dbg(DBG_MSG_ERR,
"Message type %d [%s] unrecognized, discarding.",
search.type, cw_strmsg(search.type),
cw_strstate(conn->capwap_state));
errno = EAGAIN;
return -1;
@ -332,18 +452,18 @@ static int process_elements(struct conn *conn, uint8_t * rawmsg, int len,
/* Check if current state is in state of message */
ui = message->states;
for (ui=message->states; ui->state; ui++){
printf("Comparing %d and %d\n", conn->capwap_state, ui->state);
if(ui->state==conn->capwap_state){
for (ui = message->states; ui->state; ui++) {
/* printf("Comparing %d and %d\n", conn->capwap_state, ui->state);*/
if (ui->state == conn->capwap_state) {
break;
}
}
if (!ui->state){
if (!ui->state) {
/* Message found, but it was in wrong state */
cw_dbg(DBG_MSG_ERR,
"Message type %d (%s) not allowed in %s State, sending response.",
search.type,cw_strmsg(search.type),
"Message type %d (%s) not allowed in %s State, sending response.",
search.type, cw_strmsg(search.type),
cw_strstate(conn->capwap_state));
result_code = CAPWAP_RESULT_MSG_INVALID_IN_CURRENT_STATE;
cw_send_error_response(conn, rawmsg, result_code);
@ -352,93 +472,59 @@ static int process_elements(struct conn *conn, uint8_t * rawmsg, int len,
}
/* if (conn->msg_start){
conn->msg_start(conn, afm, rawmsg, len, from);
}
*/
/* Execute start processor for message */
/*
// if (afm->start) {
// afm->start(conn, afm, rawmsg, len, from);
// }
*/
elems_ptr = cw_get_msg_elems_ptr(msg_ptr);
/* if (cw_dbg_is_level(DBG_ELEM_IN)){
cw_dbg(DBG_MSG_PARSING, "Parsing message of type %d - (%s)",
message->type, message->name);
}*/
/* Create an avltree to catch the found mandatory elements */
/* //conn->mand = stravltree_create();*/
mand_found = mavl_create_conststr();
unrecognized = mlist_create(NULL,NULL,sizeof(uint8_t*));
cw_dbg(DBG_MSG_PARSING ,"*** Parsing message of type %d - (%s) ***",
message->type,message->name);
/* iterate through message elements */
cw_foreach_elem(elem, elems_ptr, elems_len) {
int rc;
struct cw_ElemHandlerParams params;
int elem_len, elem_id, max_len;
uint8_t * elem_data;
elem_len = cw_get_elem_len(elem);
elem_data=cw_get_elem_data(elem);
elem_id = cw_get_elem_id(elem);
max_len=elems_len-(elem_data-elems_ptr);
if (elem_len > max_len){
cw_dbg(DBG_RFC,
"Messag element claims size of %d bytes, but only %d bytes are left in the payload, truncating.",
elem_len,max_len-4);
}
memset(&params,0,sizeof(struct cw_ElemHandlerParams));
params.mand_found = mavl_create_conststr();
params.unrecognized = mlist_create(NULL, NULL, sizeof(uint8_t *));
params.conn=conn;
params.from=from;
params.msgdata=message;
params.mand_found=mand_found;
rc = cw_process_element(&params,0,0,elem_id,elem_data,elem_len);
params.cfg = cw_cfg_create();
params.cfg->dbg_level = DBG_ELEM_DETAIL_IN;
params.cfg->dbg_prefix = " ";
if (cw_result_is_ok(rc))
continue;
if (rc == CAPWAP_RESULT_UNRECOGNIZED_MESSAGE_ELEMENT){
mlist_append(unrecognized,&elem);
continue;
}
if (rc < 0 ){
continue;
}
params.cfg_list=conn->cfg_list;
}
params.from = from;
params.msgdata = message;
params.msgset=conn->msgset;
params.conn = conn;
params.dbg_level = DBG_ELEM_IN;
cw_decode_elements(&params,elems_ptr, elems_len);
/* all message elements are processed, do now after processing
by calling the "end" function for the message */
cw_check_missing_mand(message,mand_found);
cw_dbg(DBG_MSG_PARSING," *** Done parsing message of type %d (%s) ***",
message->type,message->name);
mavl_destroy(mand_found);
/* cw_dbg_ktv_dump(conn->remote_cfg,DBG_CFG_DMP,
" *** Remote CFG dump ***", "CFG:", " *** End of remote CFG dump");
*/
if (params.mand_found)
cw_check_missing_mand(message, params.mand_found,conn->msgset->handlers_by_key);
if (message->postprocess){
message->postprocess(conn);
// cw_dbg(DBG_MSG_PARSING, "*** End parsing message of type %d (%s) ***",
// message->type, message->name);
if (params.mand_found)
mavl_destroy(params.mand_found);
if (message->postprocess) {
message->postprocess(&params,elems_ptr, elems_len);
}
cw_MsgCallbackFun cb_fun = cw_conn_get_msg_cb(conn,message->type);
if (cb_fun != NULL){
result_code = cb_fun(&params,elems_ptr, elems_len);
}
else{
cw_cfg_clear(conn->update_cfg);
}
// conn->remote_cfg=params.cfg;
/* if we've got a request message, we always have to send a response message */
if (message->type & 1) {
@ -448,12 +534,13 @@ static int process_elements(struct conn *conn, uint8_t * rawmsg, int len,
cw_send_error_response(conn, rawmsg, result_code);
} else if (result_code == 0) {
cw_ktv_set_dword(conn->local_cfg,"result-code",result_code);
if (ui->next){
cw_cfg_set_int(conn->update_cfg, "capwap/result-code",
result_code);
if (ui->next) {
conn->capwap_prevstate = conn->capwap_state;
conn->capwap_state = ui->next;
}
/* All is ok, send regular response message */
cw_send_response(conn, rawmsg, len);
} else {
@ -468,7 +555,10 @@ static int process_elements(struct conn *conn, uint8_t * rawmsg, int len,
*/
}
/*stravltree_destroy(conn->mand);*/
if (params.unrecognized)
mlist_destroy(params.unrecognized);
cw_cfg_destroy(params.cfg);
// conn->remote_cfg=NULL;
return result_code;
@ -479,12 +569,12 @@ static int process_elements(struct conn *conn, uint8_t * rawmsg, int len,
int process_message(struct conn *conn, uint8_t * rawmsg, int rawlen,
int process_message(struct cw_Conn *conn, uint8_t * rawmsg, int rawlen,
struct sockaddr *from)
{
char sock_buf[SOCK_ADDR_BUFSIZE];
uint8_t seqnum;
int s1,s2,sd;
int s1, s2, sd;
uint8_t *msgptr = rawmsg + cw_get_hdr_msg_offset(rawmsg);
@ -508,13 +598,14 @@ int process_message(struct conn *conn, uint8_t * rawmsg, int rawlen,
if ((sd > 0 && sd < 128) || (sd < 0 && sd < -128) || s1 < 0) {
/* seqnum is ok, normal message processing */
conn->last_seqnum_received = seqnum;
return process_elements(conn, rawmsg, rawlen, from);
}
if (sd != 0) {
cw_dbg(DBG_MSG_ERR,
"Discarding message from %s, old seqnum, seqnum = %d, last seqnum=%d",
sock_addr2str(&conn->addr,sock_buf), s2, s1);
sock_addr2str(&conn->addr, sock_buf), s2, s1);
errno = EAGAIN;
return -1;
}
@ -525,13 +616,13 @@ int process_message(struct conn *conn, uint8_t * rawmsg, int rawlen,
cw_dbg(DBG_MSG_ERR,
"Retransmitted request message from %s detected, seqnum=%d, type=%d",
sock_addr2str(&conn->addr,sock_buf), s2, type);
sock_addr2str(&conn->addr, sock_buf), s2, type);
if (cw_get_hdr_msg_type(conn->resp_buffer) - 1 != type) {
cw_dbg(DBG_MSG_ERR,
/* cw_dbg(DBG_MSG_ERR,
"No cached response for retransmission, request seqnum=%d,in cache=%d",
s2, conn->resp_msg.type);
s2, conn->resp_msg.type);*/
errno = EAGAIN;
return -1;
}
@ -539,7 +630,7 @@ int process_message(struct conn *conn, uint8_t * rawmsg, int rawlen,
cw_dbg(DBG_MSG_ERR, "Retransmitting response message to %s, seqnum=%d",
sock_addr2str(&conn->addr, sock_buf), s2);
/*// XXX untested*/
/*// XXX untested */
conn_send_msg(conn, conn->resp_buffer);
errno = EAGAIN;
return -1;
@ -552,14 +643,14 @@ int process_message(struct conn *conn, uint8_t * rawmsg, int rawlen,
* @param packet pointer to packet data
* @param len lenght of packet data
*/
int conn_process_packet2(struct conn *conn, uint8_t * packet, int len,
struct sockaddr *from)
int conn_process_packet2(struct cw_Conn *conn, uint8_t * packet, int len,
struct sockaddr *from)
{
char sock_buf[SOCK_ADDR_BUFSIZE];
int preamble;
int offs;
int payloadlen;
if (len < 8) {
/* packet too short */
cw_dbg(DBG_PKT_ERR,
@ -575,8 +666,8 @@ int conn_process_packet2(struct conn *conn, uint8_t * packet, int len,
/* wrong version */
cw_dbg(DBG_PKT_ERR,
"Discarding packet from %s, wrong version, version=%d, version %d expected.",
sock_addr2str(&conn->addr,sock_buf), (preamble & 0xf0) >> 4,
CAPWAP_VERSION);
sock_addr2str(&conn->addr, sock_buf),
(preamble & 0xf0) >> 4, CAPWAP_VERSION);
errno = EAGAIN;
return -1;
}
@ -585,7 +676,7 @@ int conn_process_packet2(struct conn *conn, uint8_t * packet, int len,
/* Encrypted data, this shuold never happen here */
cw_dbg(DBG_PKT_ERR,
"Discarding packet from %s, encrypted data after decryption ...",
sock_addr2str(&conn->addr,sock_buf));
sock_addr2str(&conn->addr, sock_buf));
errno = EAGAIN;
return -1;
}
@ -599,7 +690,7 @@ int conn_process_packet2(struct conn *conn, uint8_t * packet, int len,
/* Eleminate messages with wrong header size */
cw_dbg(DBG_PKT_ERR,
"Discarding packet from %s, header length (%d) greater than packet len (%d).",
sock_addr2str(&conn->addr,sock_buf), offs, len);
sock_addr2str(&conn->addr, sock_buf), offs, len);
errno = EAGAIN;
return -1;
}
@ -611,7 +702,8 @@ int conn_process_packet2(struct conn *conn, uint8_t * packet, int len,
/* wrong rmac size */
cw_dbg(DBG_PKT_ERR,
"Discarding packet from %s, wrong R-MAC size, size=%d",
sock_addr2str(&conn->addr,sock_buf), *(packet + 8));
sock_addr2str(&conn->addr, sock_buf),
*(packet + 8));
errno = EAGAIN;
return -1;
}
@ -623,7 +715,7 @@ int conn_process_packet2(struct conn *conn, uint8_t * packet, int len,
/* fragmented, add the packet to fragman */
uint8_t *f;
int rc;
f = fragman_add(conn->fragman, packet, offs, payloadlen);
if (f == NULL) {
errno = EAGAIN;
@ -647,23 +739,25 @@ int conn_process_packet2(struct conn *conn, uint8_t * packet, int len,
return conn->process_message(conn, packet, len, from);
}
int conn_process_packet(struct conn *conn, uint8_t * packet, int len,
struct sockaddr *from){
int conn_process_packet(struct cw_Conn *conn, uint8_t * packet, int len,
struct sockaddr *from)
{
/* show this packet in debug output */
cw_dbg_pkt(DBG_PKT_IN, conn, packet, len, from);
return conn_process_packet2(conn,packet,len,from);
return conn_process_packet2(conn, packet, len, from);
}
int conn_process_data_packet(struct conn *conn, uint8_t * packet, int len,
struct sockaddr *from){
int conn_process_data_packet(struct cw_Conn *conn, uint8_t * packet, int len,
struct sockaddr *from)
{
/* show this packet in debug output */
cw_dbg_pkt(DBG_PKT_IN, conn, packet, len, from);
return conn_process_packet2(conn,packet,len,from);
return conn_process_packet2(conn, packet, len, from);
}
@ -681,7 +775,7 @@ int conn_process_data_packet(struct conn *conn, uint8_t * packet, int len,
/**
* Used as main message loop
*/
int cw_read_messages(struct conn *conn)
int cw_read_messages(struct cw_Conn *conn)
{
uint8_t buf[2024];
int len = 2024;
@ -698,3 +792,35 @@ int cw_read_messages(struct conn *conn)
return -1;
}
/**
* Destroy a conn object
* @param object to destroy
*/
void conn_destroy(struct cw_Conn * conn)
{
dtls_shutdown(conn);
if (conn->fragman)
fragman_destroy(conn->fragman);
if (conn->q)
free (conn->q);
if (conn->msg_callbacks)
mavl_destroy(conn->msg_callbacks);
if (conn->base_rmac)
free(conn->base_rmac);
if (conn->remote_cfg)
cw_cfg_destroy(conn->remote_cfg);
if (conn->local_cfg)
cw_cfg_destroy(conn->local_cfg);
if (conn->update_cfg)
cw_cfg_destroy(conn->update_cfg);
free(conn);
}

View File

@ -30,7 +30,7 @@
#include <sys/socket.h>
#include "fragman.h"
#include "cwmsg.h"
//#include "cwmsg.h"
@ -38,7 +38,6 @@
/*#include "mbag.h"*/
#include "intavltree.h"
#include "bstr.h"
#include "msgset.h"
@ -56,7 +55,7 @@ struct cw_action_in;
/**
* Connection Object
*/
struct conn {
struct cw_Conn {
int sock;
struct sockaddr_storage addr;
@ -70,29 +69,26 @@ struct conn {
int recv_timeout;
mavl_t remote_cfg;
mavl_t default_cfg;
mavl_t update_cfg;
mavl_t local_cfg;
mavl_t global_cfg;
int (*write_header)(struct cw_ElemHandler * handler, uint8_t * dst, int len);
int (*header_len)(struct cw_ElemHandler *handler);
/* mbag_t outgoing;
mbag_t incomming;
mbag_t remote;
mbag_t local;
mbag_t radios;
mbag_t radios_upd;
mbag_t config;
mbag_t config_upd;
*/
cw_Cfg_t * global_cfg; /**< This should set the global cfg of the program
which is using this conn object.
Teh global_cfg has to be treated read-only. */
/* uint8_t session_id[16];*/
cw_Cfg_t * local_cfg; /**< local_cfg contains overrides for global_cfg
wich are related to this conn object. */
cw_Cfg_t * remote_cfg; /**< contains the configuration we now from the
device this conn object ist connected to.
Typically this is what we have got from discovery
response or join response in WTP mode.
And in AC mode this contains date receive from
configuration status request. */
cw_Cfg_t * update_cfg;
cw_Cfg_t * cfg_list[10];
bstr16_t session_id;
@ -105,16 +101,12 @@ struct conn {
uint8_t wbid;
/** Counter for mandatory message elements */
struct avltree *mand;
/** Actionsdefs - this defines the possible actions for
this conn object, so in the end this is the specification
of the protocoll */
struct cw_MsgSet * msgset;
uint8_t capwap_prevstate;
@ -135,10 +127,6 @@ struct conn {
int last_seqnum_received;
int last_message_id_received;
struct cwmsg req_msg;
struct cwmsg resp_msg;
/** Buffer for outgoing request messages */
uint8_t req_buffer[CONN_MAX_MSG_LENGTH];
@ -154,20 +142,13 @@ struct conn {
/* receive and send methods */
int (*recv_packet) (struct conn *, uint8_t *, int);
int (*recv_packet_peek) (struct conn *, uint8_t *, int);
int (*send_packet) (struct conn *, const uint8_t *, int);
/*
// int (*recv_data_packet) (struct conn *, uint8_t *,int);
// int (*send_data_packet) (struct conn *, const uint8_t *, int);
*/
int (*recv_packet) (struct cw_Conn*, uint8_t *, int);
int (*recv_packet_peek) (struct cw_Conn*, uint8_t *, int);
int (*send_packet) (struct cw_Conn*, const uint8_t *, int);
int (*readfrom) (struct cw_Conn*, uint8_t *, int, struct sockaddr_storage *);
int (*read) (struct cw_Conn*, uint8_t *, int);
int (*write) (struct cw_Conn*, const uint8_t *, int);
int (*readfrom) (struct conn *, uint8_t *, int, struct sockaddr_storage *);
int (*read) (struct conn *, uint8_t *, int);
int (*write) (struct conn *, const uint8_t *, int);
/*
// int (*write_data) (struct conn *, const uint8_t *, int);
*/
/* optional packet queue */
uint8_t **q;
int qsize;
@ -179,23 +160,23 @@ struct conn {
int cur_packet_pos;
/* dtls stuff */
int (*dtls_start) (struct conn *);
int (*dtls_accept) (struct conn *);
int (*dtls_start) (struct cw_Conn*);
int (*dtls_accept) (struct cw_Conn*);
bstr16_t dtls_psk;
int dtls_psk_enable;
int dtls_dhbits;
int (*dtls_get_psk)(struct conn *,const char *user,uint8_t**psk, int *len);
int (*dtls_get_psk)(struct cw_Conn*,const char *user,uint8_t**psk, int *len);
struct cw_Mod *cmod, *bmod;
char *dtls_cert_file;
char *dtls_key_file;
char *dtls_key_pass;
const char *dtls_cert_file;
const char *dtls_key_file;
const char *dtls_key_pass;
void *dtls_data;
char *dtls_cipher;
const char *dtls_cipher;
int dtls_error;
uint8_t dtls_cookie[8];
@ -203,7 +184,7 @@ struct conn {
int dtls_verify_peer;
int dtls_mtu;
uint8_t dtls_buffer[2048];
uint8_t dtls_buffer[4096];
int dtls_buffer_len;
int dtls_buffer_pos;
@ -219,7 +200,7 @@ struct conn {
void *data;
/** Mode */
int capwap_mode;
// int capwap_mode;
/** CAWAP mode for outgoing messages */
int capwap_mode_out;
@ -229,25 +210,27 @@ struct conn {
int strict_hdr;
int (*process_packet)(struct conn *conn, uint8_t * packet, int len,struct sockaddr *from);
int (*process_message)(struct conn *conn, uint8_t * rawmsg, int rawlen,
int (*process_packet)(struct cw_Conn*conn, uint8_t * packet, int len,struct sockaddr *from);
int (*process_message)(struct cw_Conn*conn, uint8_t * rawmsg, int rawlen,
struct sockaddr *from);
int detected;
void * mods;
struct cw_MsgSet * msgset;
void (*setup_complete)(struct cw_Conn *conn);
struct mavl * msg_callbacks;
int (*msg_start)(struct conn *conn,struct cw_action_in *a,uint8_t*data,int len,struct sockaddr *from);
int (*msg_end)(struct conn *conn,struct cw_action_in *a,uint8_t*elem,int len,struct sockaddr *from);
int (*elem_end)(struct conn *conn,struct cw_action_in *a,int afrc,uint8_t*elem,int len,struct sockaddr *from);
/*
// void (*actions_registered)(struct conn *conn);
*/
int (*msg_start)(struct cw_Conn*conn,struct cw_action_in *a,uint8_t*data,int len,struct sockaddr *from);
int (*msg_end)(struct cw_Conn*conn,struct cw_action_in *a,uint8_t*elem,int len,struct sockaddr *from);
int (*elem_end)(struct cw_Conn*conn,struct cw_action_in *a,int afrc,uint8_t*elem,int len,struct sockaddr *from);
*/
};
typedef struct cw_Conn cw_Conn_t;
@ -255,76 +238,86 @@ struct conn {
struct conn *conn_create(int sock, struct sockaddr *addr, int qsize);
struct conn *conn_create_noq(int sock, struct sockaddr *addr);
struct cw_Conn* cw_conn_create(int sock, struct sockaddr *addr, int qsize);
struct cw_Conn* conn_create_noq(int sock, struct sockaddr *addr);
extern int conn_send_cwmsg(struct conn *conn, struct cwmsg *cwmsg);
//extern int conn_send_cwmsg(struct cw_Conn*conn, struct cwmsg *cwmsg);
/*
//extern int conn_process_packet(struct conn *conn, uint8_t * packet, int len,
//extern int conn_process_packet(struct cw_Conn*conn, uint8_t * packet, int len,
// int (*cb) (void *, uint8_t *,int len), void *cbarg);
*/
extern int conn_process_packet(struct conn *conn, uint8_t * packet, int len,struct sockaddr *from);
extern int process_message(struct conn *conn, uint8_t * rawmsg, int rawlen,
extern int conn_process_packet(struct cw_Conn*conn, uint8_t * packet, int len,struct sockaddr *from);
extern int process_message(struct cw_Conn*conn, uint8_t * rawmsg, int rawlen,
struct sockaddr *from);
extern uint8_t *conn_get_message(struct conn *conn);
extern uint8_t *conn_get_message(struct cw_Conn*conn);
extern int conn_send_packet(struct conn *conn, const uint8_t * buffer, int len);
extern int conn_send_data_packet(struct conn * conn, const uint8_t * buffer, int len);
extern int conn_send_packet(struct cw_Conn*conn, const uint8_t * buffer, int len);
extern int conn_send_data_packet(struct cw_Conn* conn, const uint8_t * buffer, int len);
extern void conn_destroy(struct conn *conn);
extern void conn_destroy(struct cw_Conn*conn);
uint8_t *conn_q_get_packet(struct conn *conn);
extern int conn_q_recv_packet(struct conn *conn, uint8_t * buffer, int len);
extern int conn_q_recv_packet_peek(struct conn *conn, uint8_t * buffer, int len);
uint8_t *conn_q_get_packet(struct cw_Conn*conn);
extern int conn_q_recv_packet(struct cw_Conn*conn, uint8_t * buffer, int len);
extern int conn_q_recv_packet_peek(struct cw_Conn*conn, uint8_t * buffer, int len);
extern int conn_recv_packet(struct conn *conn, uint8_t * buf, int len);
extern int conn_recv_packet_peek(struct conn *conn, uint8_t * buf, int len);
extern int conn_recv_packet(struct cw_Conn*conn, uint8_t * buf, int len);
extern int conn_recv_packet_peek(struct cw_Conn*conn, uint8_t * buf, int len);
extern int conn_send_response(struct conn *conn, struct cwmsg *cwmsg, int seqnum);
extern struct cwrmsg *conn_get_response(struct conn *conn);
//extern int conn_send_response(struct cw_Conn*conn, struct cwmsg *cwmsg, int seqnum);
extern struct cwrmsg *conn_get_response(struct cw_Conn*conn);
#define conn_get_next_seqnum(conn) (conn->seqnum=((conn->seqnum+1)&0xff))
#define conn_get_last_seqnum(conn) (conn->seqnum&0xff)
void conn_q_add_packet(struct conn *conn, uint8_t * packet, int len);
void conn_q_add_packet(struct cw_Conn*conn, uint8_t * packet, int len);
struct image_identifier;
struct cwimage_data;
extern void conn_prepare_request(struct conn *conn, int type);
extern int conn_prepare_image_data_request(struct conn *conn, struct cwimage_data *,
extern void conn_prepare_request(struct cw_Conn*conn, int type);
extern int conn_prepare_image_data_request(struct cw_Conn*conn, struct cwimage_data *,
struct image_identifier *id);
/*
//extern void conn_detect_capwap(struct conn *conn, struct wtpinfo *wtpinfo);
//extern void conn_detect_capwap(struct cw_Conn*conn, struct wtpinfo *wtpinfo);
*/
struct cwrmsg *conn_send_request(struct conn *conn);
struct cwrmsg *conn_wait_for_message(struct conn *conn, time_t timer);
struct cwrmsg *conn_send_request(struct cw_Conn*conn);
struct cwrmsg *conn_wait_for_message(struct cw_Conn*conn, time_t timer);
struct cwrmsg *conn_wait_for_request(struct conn *conn, int *msglist, time_t timer);
struct cwrmsg *conn_wait_for_request(struct cw_Conn*conn, int *msglist, time_t timer);
int conn_q_wait_packet(struct conn * conn, int seconds);
//int conn_q_wait_packet(struct cw_Conn* conn, int seconds);
#define conn_is_error(conn) (conn->dtls_error)
void conn_init(struct conn *conn);
void cw_conn_init(struct cw_Conn*conn);
extern int cw_read_messages(struct conn *conn);
extern int cw_read_messages(struct cw_Conn*conn);
extern int conn_recvfrom_packet(struct conn *conn, uint8_t * buf, int len,
extern int conn_recvfrom_packet(struct cw_Conn*conn, uint8_t * buf, int len,
struct sockaddr_storage *from);
int conn_send_msg(struct conn * conn, uint8_t *rawmsg);
int cw_read_from(struct conn * conn, struct sockaddr_storage * from);
int conn_send_msg(struct cw_Conn* conn, uint8_t *rawmsg);
int cw_read_from(struct cw_Conn* conn, struct sockaddr_storage * from);
int conn_send_msg(struct conn *conn, uint8_t * rawmsg);
int conn_send_msg(struct cw_Conn *conn, uint8_t * rawmsg);
void conn_clear_upd(struct cw_Conn*conn, int merge);
int cw_conn_set_msg_cb(struct cw_Conn *conn, int type, cw_MsgCallbackFun fun);
cw_MsgCallbackFun cw_conn_get_msg_cb(struct cw_Conn *conn, int type);
int cw_decode_element(struct cw_ElemHandlerParams *params, int proto,
int vendor, int elem_id, uint8_t * data, int len);
int cw_decode_elements(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, int elems_len);
void conn_clear_upd(struct conn *conn, int merge);
#endif /* __CONN_H */

View File

@ -35,76 +35,4 @@
/**
* Create a conn object
* @param sock a socket
* @param addr the address associated
* @param qsize size of packet queue
* @return A pointer to the created object
* This function creates a conn obnject with queueing functionality
* for asynchronous operation.
* To create a conn object without queue functionallity use #conn_create_noq.
*/
struct conn * conn_create(int sock, struct sockaddr * addr, int qsize)
{
struct conn * conn;
conn = malloc(sizeof (struct conn));
if (!conn)
return NULL;
conn_init(conn);
conn->sock=sock;
if (addr)
sock_copyaddr(&conn->addr,addr);
conn->fragman = fragman_create();
if (conn->fragman==NULL){
conn_destroy(conn);
return NULL;
}
conn->qsize=qsize;
if (qsize != 0){
if (!(conn->q=malloc( sizeof(uint8_t *) * qsize))){
conn_destroy(conn);
return NULL;
}
conn->qrpos=-1;
if (sem_init(&conn->q_sem,0,0)!=0){
cw_log(LOG_ERR,"Fatal- Can't init semaphore for conn object: %s",strerror(errno));
conn_destroy(conn);
return NULL;
};
conn->recv_packet=conn_q_recv_packet;
conn->recv_packet_peek=conn_q_recv_packet_peek;
}
else{
conn->recv_packet = conn_recv_packet;
conn->recv_packet_peek = conn_recv_packet_peek;
}
conn->send_packet = conn_send_packet;
/* conn->send_data_packet = conn_send_data_packet;*/
conn->last_seqnum_received=-1;
conn->mtu=1500;
conn->cur_packet=0;
conn->recv_timeout=1;
conn->seqnum=-1;
conn->write = conn->send_packet;
conn->read = conn->recv_packet;
/* conn->write_data = conn->send_data_packet; */
conn->dtls_mtu = 1500;
return conn;
}

View File

@ -36,14 +36,14 @@
* @retval 1 Success
* @retval 0 failure, conslt errno for more details
*/
struct conn * conn_create_noq(int sock, struct sockaddr * addr)
struct cw_Conn * conn_create_noq(int sock, struct sockaddr * addr)
{
struct conn * conn;
conn = malloc(sizeof (struct conn));
struct cw_Conn * conn;
conn = malloc(sizeof (struct cw_Conn ));
if (!conn)
return NULL;
conn_init(conn);
cw_conn_init(conn);
conn->sock=sock;
@ -67,7 +67,8 @@ struct conn * conn_create_noq(int sock, struct sockaddr * addr)
/* misc settings */
conn->last_seqnum_received=-1;
conn->mtu=1500;
conn->mtu=480;
conn->dtls_mtu=500;
conn->cur_packet=0;

View File

@ -1,41 +0,0 @@
/*
This file is part of actube.
actube is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
libcapwap is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Foobar. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file
* @brief Implements conn_destroy
*/
#include <stdlib.h>
#include "conn.h"
/**
* Destroy a conn object
* @param object to destroy
*/
void conn_destroy(struct conn * conn)
{
if (conn->fragman)
fragman_destroy(conn->fragman);
if (conn->q)
free (conn->q);
free(conn);
}

View File

@ -1,72 +0,0 @@
/*
This file is part of libcapwap.
libcapwap is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
libcapwap is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Foobar. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file
* @brief conn_init
*/
#include <string.h>
#include "conn.h"
#include "capwap.h"
#include "cw.h"
static int write_header(struct cw_ElemHandler * handler, uint8_t * dst, int len)
{
if (handler->vendor)
return len + cw_put_elem_vendor_hdr(dst, handler->vendor, handler->id, len);
return len + cw_put_elem_hdr(dst, handler->id, len);
}
static int header_len(struct cw_ElemHandler * handler)
{
return handler->vendor ? 10 : 4;
}
/**
* Basic initialization of a conn object
* @param conn conn object to initialize
*/
void conn_init(struct conn * conn)
{
memset(conn,0,sizeof(struct conn));
conn->retransmit_interval=CAPWAP_RETRANSMIT_INTERVAL;
conn->max_retransmit=CAPWAP_MAX_RETRANSMIT;
conn->wait_dtls=CAPWAP_WAIT_DTLS;
conn->wait_join=CAPWAP_WAIT_JOIN;
conn->mtu_discovery=1;
conn->capwap_mode = 0;
conn->strict_capwap=1;
conn->process_packet=conn_process_packet;
conn->process_message=process_message;
conn->write_header = write_header;
conn->header_len = header_len;
}

View File

@ -25,7 +25,7 @@
#include "sock.h"
void conn_q_add_packet(struct conn * conn,uint8_t *packet,int len)
void conn_q_add_packet(struct cw_Conn * conn,uint8_t *packet,int len)
{
char sock_buf[SOCK_ADDR_BUFSIZE];
int qwpos = conn->qwpos;
@ -42,7 +42,6 @@ void conn_q_add_packet(struct conn * conn,uint8_t *packet,int len)
conn->q[qwpos]=malloc(len+4);
if (conn->q[qwpos]==NULL)
return;
*((uint32_t*)(conn->q[qwpos]))=len;
memcpy(conn->q[qwpos]+4,packet,len);
conn->qwpos=qwpos+1;

View File

@ -19,7 +19,7 @@
#include <time.h>
#include "conn.h"
uint8_t * conn_q_get_packet(struct conn * conn)
uint8_t * conn_q_get_packet(struct cw_Conn * conn)
{
int qrpos;
struct timespec timespec;

View File

@ -22,7 +22,7 @@
#include "conn.h"
static int conn_q_recv_packet_(struct conn * conn, uint8_t * buffer,int len,int peek)
static int conn_q_recv_packet_(struct cw_Conn * conn, uint8_t * buffer,int len,int peek)
{
if ( !conn->cur_packet)
{
@ -58,12 +58,12 @@ static int conn_q_recv_packet_(struct conn * conn, uint8_t * buffer,int len,int
return conn->cur_packet_len;
}
int conn_q_recv_packet(struct conn * conn, uint8_t * buffer,int len)
int conn_q_recv_packet(struct cw_Conn * conn, uint8_t * buffer,int len)
{
return conn_q_recv_packet_(conn,buffer,len,0);
}
int conn_q_recv_packet_peek(struct conn * conn, uint8_t * buffer,int len)
int conn_q_recv_packet_peek(struct cw_Conn * conn, uint8_t * buffer,int len)
{
return conn_q_recv_packet_(conn,buffer,len,1);
}

View File

@ -3,7 +3,7 @@
#include "conn.h"
int conn_q_wait_packet(struct conn * conn, int seconds)
int conn_q_wait_packet(struct cw_Conn * conn, int seconds)
{
struct timespec timespec;

View File

@ -27,8 +27,9 @@
#include "sock.h"
int conn_recv_packet_(struct conn *conn, uint8_t * buf, int len, int flags)
int conn_recv_packet_(struct cw_Conn *conn, uint8_t * buf, int len, int flags)
{
printf("conn_recv\n");
int n;
while ((n = recv(conn->sock, (char *) buf, len, flags)) < 0) {
if (errno != EINTR) {
@ -41,7 +42,7 @@ int conn_recv_packet_(struct conn *conn, uint8_t * buf, int len, int flags)
}
int conn_recvfrom_packet(struct conn *conn, uint8_t * buf, int len,
int conn_recvfrom_packet(struct cw_Conn *conn, uint8_t * buf, int len,
struct sockaddr_storage *from)
{
int n;
@ -65,7 +66,7 @@ int conn_recvfrom_packet(struct conn *conn, uint8_t * buf, int len,
#include "log.h"
int conn_recv_packet_x(struct conn *conn, uint8_t * buf, int len, int flags)
int conn_recv_packet_x(struct cw_Conn *conn, uint8_t * buf, int len, int flags)
{
int port;
socklen_t al;
@ -104,12 +105,12 @@ int conn_recv_packet_x(struct conn *conn, uint8_t * buf, int len, int flags)
/* yes, these functions could be better defined as macros in a .h file */
int conn_recv_packet(struct conn *conn, uint8_t * buf, int len)
int conn_recv_packet(struct cw_Conn *conn, uint8_t * buf, int len)
{
return conn_recv_packet_x(conn, buf, len, 0);
}
int conn_recv_packet_peek(struct conn *conn, uint8_t * buf, int len)
int conn_recv_packet_peek(struct cw_Conn *conn, uint8_t * buf, int len)
{
int rc = conn_recv_packet_(conn, buf, len, MSG_PEEK);
return rc;

View File

@ -29,7 +29,7 @@
#include "dbg.h"
int conn_send_data_packet(struct conn * conn, const uint8_t * buffer, int len)
int conn_send_data_packet(struct cw_Conn * conn, const uint8_t * buffer, int len)
{
char sock_buf[SOCK_ADDR_BUFSIZE];
int n;

View File

@ -3,8 +3,9 @@
#include "dbg.h"
#define CW_MODE_ZYXEL 7
extern int cw_send_msg(struct cw_Conn * conn,uint8_t * msg);
int conn_send_msg(struct conn * conn, uint8_t *rawmsg)
int conn_send_msg(struct cw_Conn * conn, uint8_t *rawmsg)
{
uint8_t * ptr;
int packetlen;
@ -13,12 +14,50 @@ int conn_send_msg(struct conn * conn, uint8_t *rawmsg)
packetlen = cw_get_hdr_msg_total_len(rawmsg);
cw_dbg_msg(DBG_MSG_OUT, conn,rawmsg, packetlen,(struct sockaddr*)&conn->addr);
{
int type;
uint8_t *msgptr;
msgptr = rawmsg + cw_get_hdr_msg_offset(rawmsg);
struct cw_MsgData * msg;
type = cw_get_msg_type(msgptr);
msg = cw_msgset_get_msgdata(conn->msgset,type);
uint8_t *elems_ptr;
int offset = cw_get_hdr_msg_offset(rawmsg);
uint8_t *msg_ptr = rawmsg + offset;
int elems_len = cw_get_msg_elems_len(msg_ptr);
elems_ptr = cw_get_msg_elems_ptr(msg_ptr);
cw_Cfg_t * cfg = cw_cfg_create();
cfg->dbg_level = DBG_ELEM_DETAIL_OUT;
cfg->dbg_prefix = " ";
struct cw_ElemHandlerParams params;
memset(&params,0,sizeof(struct cw_ElemHandlerParams));
params.cfg=cfg;
params.msgset=conn->msgset;
params.msgdata=msg;
params.mand_found = mavl_create_conststr();
params.dbg_level = DBG_ELEM_OUT;
cw_decode_elements( &params, elems_ptr,elems_len);
cw_cfg_destroy(cfg);
if (params.mand_found){
cw_check_missing_mand(msg, params.mand_found,conn->msgset->handlers_by_key);
mavl_destroy(params.mand_found);
}
}
/* Zyxel doesn't count msg element length from
behind seqnum */
if (conn->capwap_mode == CW_MODE_ZYXEL){
// if (conn->capwap_mode == CW_MODE_ZYXEL){
/* // XXX val-=3; */
}
// }
ptr = rawmsg;
@ -28,7 +67,31 @@ int conn_send_msg(struct conn * conn, uint8_t *rawmsg)
hlen = cw_get_hdr_hlen(rawmsg)*4;
mtu = conn->mtu;
mtu = 800;
mtu = 9440;
mtu = mtu >> 3;
mtu = mtu << 3;
// printf("packetlenX = %d (%d)\n",packetlen,hlen);
int offset = cw_get_hdr_msg_offset(rawmsg);
return cw_send_msg(conn,rawmsg+offset);
if (packetlen>mtu){
cw_set_hdr_flags(ptr,CAPWAP_FLAG_HDR_F,1);
cw_set_dword(ptr+4, conn->fragid<<16 | fragoffset<<3 );
cw_dbg_pkt(DBG_PKT_OUT,conn,ptr,mtu,(struct sockaddr*)&conn->addr);
if (conn->write(conn,ptr,mtu)<0)
return -1;
cw_set_hdr_flags(ptr,CAPWAP_FLAG_HDR_M,0);
cw_set_hdr_flags(ptr,CAPWAP_FLAG_HDR_W,0);
fragoffset+=(mtu-hlen)/8;
hlen = 8;
ptr += mtu-hlen;
packetlen-=mtu-hlen;
memcpy(ptr,rawmsg,hlen);
}
while (packetlen>mtu){

View File

@ -27,7 +27,7 @@
int conn_send_packet(struct conn * conn, const uint8_t * buffer, int len)
int conn_send_packet(struct cw_Conn * conn, const uint8_t * buffer, int len)
{
int n;
while((n=sendto( conn->sock, buffer, len, 0,

View File

@ -1,64 +0,0 @@
/*
This file is part of libcapwap.
libcapwap is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
libcapwap is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Foobar. If not, see <http://www.gnu.org/licenses/>.
*/
/**
*@file
*@brief conn_send_request
*/
#include "capwap.h"
#include "cw_util.h"
#include "log.h"
/**
* Send a request message and wait for its response
* @param conn the connection
*
* The message has to be prepared and put to conn->req_msg
*
*/
/*
struct cwrmsg * conn_send_request(struct conn * conn)
{
int i;
struct cwrmsg * cwrmsg;
struct cwmsg * cwmsg = &conn->req_msg;
for (i=0; i<conn->max_retransmit; i++) {
time_t r_timer = cw_timer_start(conn->retransmit_interval);
if (i!=0)
cw_dbg(DBG_MSG_ERR,"Retransmitting message, type=%d,seq=%d",cwmsg->type,cwmsg->seqnum);
conn_send_cwmsg(conn,&conn->req_msg);
cwrmsg = conn_wait_for_message(conn,r_timer);
if (cwrmsg){
if (cwrmsg->type == conn->req_msg.type+1){
return cwrmsg;
}
}
}
cw_dbg(DBG_MSG_ERR,"Max retransmit's reached, message type=%d,seq=%d",cwmsg->type,cwmsg->seqnum);
return 0;
}
*/

View File

@ -39,24 +39,24 @@
static int cmp_by_addr_p ( const void * d1, const void *d2 )
{
struct conn * c1 = * ( void ** ) d1 ;
struct conn * c2 = * ( void ** ) d2 ;
struct cw_Conn * c1 = * ( void ** ) d1 ;
struct cw_Conn * c2 = * ( void ** ) d2 ;
return sock_cmpaddr ( ( struct sockaddr* ) &c1->addr, ( struct sockaddr* ) &c2->addr, 1 );
}
static int cmp_by_addr ( const void * d1, const void *d2 )
{
struct conn * c1 = * ( void ** ) d1 ;
struct conn * c2 = * ( void ** ) d2 ;
struct cw_Conn * c1 = * ( void ** ) d1 ;
struct cw_Conn * c2 = * ( void ** ) d2 ;
return sock_cmpaddr ( ( struct sockaddr* ) &c1->addr, ( struct sockaddr* ) &c2->addr, 0 );
}
static int cmp_by_session_id ( const void *d1, const void *d2 )
{
struct conn * c1 = *( void ** ) d1;
struct conn * c2 = *( void ** ) d2;
struct cw_Conn * c1 = *( void ** ) d1;
struct cw_Conn * c2 = *( void ** ) d2;
int len1,len2;
if (c1->session_id==NULL && c2->session_id==NULL)
@ -133,6 +133,9 @@ void connlist_destroy ( struct connlist * cl )
if ( cl->by_addr )
mavl_destroy ( cl->by_addr );
if ( cl->by_session_id)
mavl_destroy ( cl->by_session_id );
pthread_mutex_destroy ( &cl->connlist_mutex );
free ( cl );
@ -140,35 +143,35 @@ void connlist_destroy ( struct connlist * cl )
}
struct conn * connlist_get ( struct connlist * cl, const struct sockaddr * addr )
struct cw_Conn * connlist_get ( struct connlist * cl, const struct sockaddr * addr )
{
struct conn search;
struct cw_Conn search;
sock_copyaddr ( &search.addr, addr );
return mavl_get_ptr ( cl->by_addr, &search );
}
struct conn * connlist_add ( struct connlist * cl, struct conn * conn )
struct cw_Conn * connlist_add ( struct connlist * cl, struct cw_Conn * conn )
{
if ( cl->len != 0 )
if ( cl->by_addr->count >= cl->len )
return NULL;
conn->connlist = cl;
return mavl_add_ptr ( cl->by_addr, conn );
return mavl_insert_ptr ( cl->by_addr, conn );
}
struct conn * connlist_get_by_session_id ( struct connlist *cl, struct conn * conn )
struct cw_Conn * connlist_get_by_session_id ( struct connlist *cl, struct cw_Conn * conn )
{
return mavl_get_ptr ( cl->by_session_id, conn );
}
struct conn * connlist_add_by_session_id ( struct connlist * cl, struct conn * conn )
struct cw_Conn * connlist_add_by_session_id ( struct connlist * cl, struct cw_Conn * conn )
{
return mavl_add_ptr ( cl->by_session_id, conn );
return mavl_insert_ptr ( cl->by_session_id, conn );
}
void connlist_remove ( struct connlist *cl, struct conn * conn )
void connlist_remove ( struct connlist *cl, struct cw_Conn * conn )
{
void * md;
md = conn;

View File

@ -7,7 +7,7 @@
#include "pthread.h"
struct connlist {
/* struct conn ** connlist; */
/* struct cw_Conn ** connlist; */
struct mavl *by_addr;
struct mavl *by_session_id;
@ -22,12 +22,12 @@ struct connlist *connlist_create(int len, int cmpports);
void connlist_lock(struct connlist *cl);
void connlist_unlock(struct connlist *cl);
void conlist_destroy(struct connlist *cl);
struct conn *connlist_get(struct connlist *cl, const struct sockaddr *addr);
struct conn *connlist_add(struct connlist *cl, struct conn *conn);
void connlist_remove(struct connlist *cl, struct conn *conn);
struct cw_Conn *connlist_get(struct connlist *cl, const struct sockaddr *addr);
struct cw_Conn *connlist_add(struct connlist *cl, struct cw_Conn *conn);
void connlist_remove(struct connlist *cl, struct cw_Conn *conn);
void connlist_destroy(struct connlist *cl);
struct conn * connlist_get_by_session_id(struct connlist *cl, struct conn * conn);
struct conn * connlist_add_by_session_id(struct connlist * cl, struct conn * conn);
struct cw_Conn * connlist_get_by_session_id(struct connlist *cl, struct cw_Conn * conn);
struct cw_Conn * connlist_add_by_session_id(struct connlist * cl, struct cw_Conn * conn);
#endif

272
src/cw/cw.c Normal file
View File

@ -0,0 +1,272 @@
#include "cw.h"
#include "log.h"
#include "dbg.h"
#include "keys.h"
int cw_in_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params,
uint8_t * elem_data, int elem_len)
{
cw_Type_t * type;
type = (cw_Type_t*)handler->type;
char mkey[CW_CFG_MAX_KEY_LEN];
const char *key;
if (!type){
cw_log(LOG_ERR,"Can't handle element: %s, no type defined",handler->name);
return CAPWAP_RESULT_UNRECOGNIZED_MESSAGE_ELEMENT;
}
if (handler->mkkey != NULL){
handler->mkkey(handler->key,elem_data,elem_len, mkey);
key = mkey;
}
else{
key = handler->key;
}
/* cw_dbg(DBG_X, "READ: %s / %s",type->name,key);*/
type->read(params->cfg, key,elem_data,elem_len,handler->param);
return CAPWAP_RESULT_SUCCESS;
}
int cw_out_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params
, uint8_t * dst)
{
int start, len, l;
// cw_dbg(DBG_X,"cw_out_generic (%s)%s",((struct cw_Type*)handler->type)->name,handler->key);
// cw_dbg(DBG_X,"Generic out!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
// cw_cfg_dump(params->cfg);
// cw_dbg(DBG_X,"Generic out!!!!!!!!!!!!!!!!!!!!!!!!!!!! ENDDUMP");
start = params->msgset->header_len(handler);
len = ((const cw_Type_t*)(handler->type))->
write(params->cfg_list,handler->key,dst+start,handler->param);
// cw_dbg(DBG_X, "Type result is %d",len);
if (len == -1) {
const char *vendor="";
if ( handler->vendor ) {
vendor=cw_strvendor(handler->vendor);
}
if ( params->elemdata->mand) {
cw_log(LOG_ERR,
"Can't put mandatory element %s %d-(%s) into %s. No value for '%s' found.",
vendor, handler->id, handler->name, params->msgdata->name
, handler->key
);
}
else{
/* cw_dbg(DBG_WARN,"No output for element %s%d -(%s) in %s. Item %s not found.",
vendor,
a->elem_id, cw_strelemp(conn->actions, a->elem_id)
, cw_strmsg(a->msg_id),a->item_id);
*/
}
return 0;
}
l = params->msgset->write_header(handler,dst,len);
return l;
}
int cw_in_radio_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params,
uint8_t * elem_data, int elem_len)
{
char key[CW_CFG_MAX_KEY_LEN];
int radio;
struct cw_Type *type;
type = (struct cw_Type*)handler->type;
if (!type){
cw_log(LOG_ERR,"Can't handle element: %s, no type defined",handler->name);
return CAPWAP_RESULT_UNRECOGNIZED_MESSAGE_ELEMENT;
}
radio=cw_get_byte(elem_data);
sprintf(key,"radio.%d/%s",radio,handler->key);
/*cw_cfg_set_val(params->cfg, key,
handler->type, handler->param, elem_data+1,elem_len-1);*/
type->read(params->cfg, key,elem_data+1,elem_len-1,handler->param);
return CAPWAP_RESULT_SUCCESS;
}
int cw_out_radio_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params
, uint8_t * dst)
{
char key[CW_CFG_MAX_KEY_LEN];
struct cw_Type * type;
int len,i,l,start;
int radios;
len =0;
radios = cw_cfg_get_byte_l(params->cfg_list,"capwap/wtp-descriptor/max-radios",0);
for(i=0;i<radios;i++){
type = (struct cw_Type*)handler->type;
start = params->msgset->header_len(handler)+len;
sprintf(key,"radio.%d/%s",i,handler->key);
//printf("RADIO KEY: %s\n",key);
// cw_dbg(DBG_X,"KEY: %s",key);
l = type->write(params->cfg_list, key,dst+start+1,handler->param);
if (l==-1)
continue;
l += cw_put_byte(dst+start,i);
l = params->msgset->write_header(handler,dst+len,l);
len+=l;
}
return len;
}
int cw_write_header(struct cw_ElemHandler * handler, uint8_t * dst, int len)
{
if (handler->vendor)
return len + cw_put_elem_vendor_hdr(dst, handler->vendor, handler->id, len);
return len + cw_put_elem_hdr(dst, handler->id, len);
}
int cw_header_len(struct cw_ElemHandler * handler)
{
return handler->vendor ? 10 : 4;
}
/**
* Put the "status part" of an an AC Descriptor to memory
* @param cfg_list Cfg list to read status from
* @param dst Where to put the status to
* @param parent_key prefix to each key
*/
int
cw_put_ac_status(uint8_t *dst, cw_Cfg_t ** cfg_list, const char * parent_key){
uint8_t *d = dst;
char key[CW_CFG_MAX_KEY_LEN];
/* put statiosn */
sprintf(key,"%s/%s",parent_key,"stations");
d += cw_put_word(d,cw_cfg_get_word_l(cfg_list,key,0));
/* put station limit */
sprintf(key,"%s/%s",parent_key,"station-limit");
d += cw_put_word(d,cw_cfg_get_word_l(cfg_list,key,0));
/* Put number of active WTPs */
sprintf(key,"%s/%s",parent_key,"active-wtps");
d += cw_put_word(d,cw_cfg_get_word_l(cfg_list,key,0));
/* Put max WTPs */
sprintf(key,"%s/%s",parent_key,"max-wtps");
d += cw_put_word(d,cw_cfg_get_word_l(cfg_list,key,0));
/* Put security flags */
sprintf(key,"%s/%s",parent_key,"security");
d += cw_put_byte(d,cw_cfg_get_byte_l(cfg_list,key,0));
/* Put rmac-filed */
sprintf(key,"%s/%s",parent_key,"rmac-field");
d += cw_put_byte(d,cw_cfg_get_byte_l(cfg_list,key,0));
/* reserved field, must be zero - RFC5415 */
d += cw_put_byte(d,0);
sprintf(key,"%s/%s",parent_key,"dtls-policy");
d += cw_put_byte(d,cw_cfg_get_byte_l(cfg_list,key,0));
return d - dst;
}
/**
* Put a descripter sub element like harware vendor/version etc.
* Used when putting AC Descriptors or WTP Descriptors
* @param dst Where to write to
* @param cfg_list list of cfgs
* @subelem_id Id of subelement
* @parent_key parent key
*/
int
cw_put_descriptor_subelem (uint8_t *dst, cw_Cfg_t ** cfg_list,
int subelem_id, const char * parent_key )
{
char key[256];
uint32_t vendor;
//bstr16_t version;
const char *vendor_s;
uint8_t *d;
/* d += cw_put_dword(d, bstrv_get_vendor_id(v));
d += cw_put_dword(d, (subelem_id << 16) | bstrv_len(v));
d += cw_put_data(d, bstrv_data(v), bstrv_len(v));
*/
sprintf (key, "%s/%s", parent_key, CW_SKEY_VENDOR);
vendor_s = cw_cfg_get_l (cfg_list, key, NULL);
if (vendor_s == NULL) {
cw_log (LOG_ERR, "Can't put subelem %s, no value of type Dword found.", key);
return 0;
}
vendor = atoi(vendor_s);
sprintf (key, "%s/%s", parent_key, CW_SKEY_VERSION);
cw_Val_t * val = cw_cfg_get_val_l(cfg_list, key, CW_TYPE_BSTR16);
//version = cw_cfg_get_bstr16 (cfg, key, NULL);
if (val == NULL) {
cw_log (LOG_ERR, "Can't put subelem %s, no value of type Bstr16 found.", key);
return 0;
}
d = dst;
/* put vendor */
d += cw_put_dword(d, vendor); //->type->put (vendor, d);
/* put version */
d += cw_put_dword (d, (subelem_id << 16) | val->type->len(val));
// d += cw_put_bstr16(d, version);
d += val->type->put(val,d);
cw_val_destroy(val);
// free(version);
return d-dst;
}

View File

@ -98,8 +98,13 @@
/* macros to acces transport header values */
#define cw_get_hdr_preamble(th) (th[0])
#define cw_get_hdr_fragid(th) ((ntohl((((uint32_t*)th)[1]) >> 16) & 0xffff))
#define cw_get_hdr_fragoffset(th) ((ntohl((((uint32_t*)th)[1]) >> 3) & 0x1fff))
#define cw_get_hdr_fragid(th)\
(((ntohl(*(((uint32_t*)(th))+1))) >> 16) & 0xffff)
#define cw_get_hdr_fragoffset(th)\
(((ntohl(*(((uint32_t*)(th))+1))) >> 3) & 0x1fff)
#define cw_get_hdr_rid(th) ((ntohl((((uint32_t*)th)[0]) >> 14) & 0x1f))
#define cw_get_hdr_wbid(th) ((ntohl(((uint32_t*)th)[0]) >> 9) & 0x1f)
#define cw_get_hdr_hlen(th) ((ntohl(((uint32_t*)th)[0]) >> 19) & 0x1f)
@ -322,7 +327,7 @@ int cw_put_elem_result_code(uint8_t * dst, uint32_t code);
/*extern int cw_put_ac_status(uint8_t * dst, struct cw_ac_status *s, struct conn *conn);*/
/*extern int cw_put_ac_status(uint8_t * dst, struct cw_ac_status *s, struct cw_Conn *conn);*/
struct cw_DescriptorSubelemDef {
@ -343,43 +348,44 @@ struct cw_DescriptorSubelemDef {
int cw_check_missing_mand(struct cw_MsgData *msgdata, mavl_t keys );
//int cw_check_missing_mand(struct cw_MsgData *msgdata, mavl_t keys );
int cw_check_missing_mand(struct cw_MsgData *msgdata, mavl_t keys, mavl_t handlers_by_key );
extern int cw_read_descriptor_subelems(mavl_t store, const char * key, uint8_t * data, int len,
extern int cw_read_descriptor_subelems(cw_Cfg_t * store, const char * key, uint8_t * data, int len,
struct cw_DescriptorSubelemDef *elems);
/*
int cw_read_wtp_descriptor(mavl_t mbag, struct conn *conn,
int cw_read_wtp_descriptor(mavl_t mbag, struct cw_Conn *conn,
struct cw_ElemHandler *eh, uint8_t * data, int len,
struct cw_DescriptorSubelemDef *allowed);
*/
int cw_read_wtp_descriptor(mavl_t mbag, struct conn *conn,
int cw_read_wtp_descriptor(cw_Cfg_t * mbag, struct cw_Conn *conn,
struct cw_ElemHandler *eh, uint8_t * data, int len,
struct cw_DescriptorSubelemDef *allowed);
int cw_write_descriptor_subelem (uint8_t *dst, mavl_t ktvstore,
int cw_write_descriptor_subelem (uint8_t *dst, cw_Cfg_t ** cfg_list,
int subelem_id, const char * parent_key);
int cw_write_radio_element(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params, int idx,
uint8_t * dst);
extern int cw_read_wtp_descriptor_7(mavl_t mbag, struct conn *conn,
extern int cw_read_wtp_descriptor_7(cw_Cfg_t * cfg, struct cw_Conn *conn,
struct cw_ElemHandler *eh, uint8_t * data, int len,
struct cw_DescriptorSubelemDef *allowed);
int cw_read_ac_descriptor(mavl_t store,
int cw_read_ac_descriptor(cw_Cfg_t * store,
struct cw_ElemHandler *eh,
struct cw_ElemHandlerParams * params,
uint8_t *data, int len,
struct cw_DescriptorSubelemDef *allowed);
int cw_setup_dtls(struct conn * conn, mavl_t cfg, const char *prefix, char * default_cipher);
int cw_setup_dtls(struct cw_Conn * conn, cw_Cfg_t * cfg, const char *prefix, char * default_cipher);
@ -439,11 +445,11 @@ int cw_out_radio_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerP
int cw_out_radio_generic_struct(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params
, uint8_t * dst);
extern int cw_in_wtp_reboot_statistics(struct conn *conn, struct cw_action_in *a,
extern int cw_in_wtp_reboot_statistics(struct cw_Conn *conn, struct cw_action_in *a,
uint8_t * data, int len, struct sockaddr *from);
extern int cw_in_wtp_board_data(struct conn *conn, struct cw_action_in *a, uint8_t * data,
extern int cw_in_wtp_board_data(struct cw_Conn *conn, struct cw_action_in *a, uint8_t * data,
int len, struct sockaddr *from);
/*
@ -452,24 +458,24 @@ int cw_in_vendor_specific_payload(struct cw_ElemHandler *handler,
uint8_t * data, int len);
*/
extern int cw_in_capwap_control_ip_address(struct conn *conn, struct cw_action_in *a,
extern int cw_in_capwap_control_ip_address(struct cw_Conn *conn, struct cw_action_in *a,
uint8_t * data, int len,
struct sockaddr *from);
extern int cw_in_capwap_local_ipv4_address(struct conn *conn, struct cw_action_in *a,
extern int cw_in_capwap_local_ipv4_address(struct cw_Conn *conn, struct cw_action_in *a,
uint8_t * data, int len,
struct sockaddr *from);
extern int cw_in_capwap_local_ipv6_address(struct conn *conn, struct cw_action_in *a,
extern int cw_in_capwap_local_ipv6_address(struct cw_Conn *conn, struct cw_action_in *a,
uint8_t * data, int len,
struct sockaddr *from);
extern int cw_in_radio_operational_state(struct conn *conn, struct cw_action_in *a,
extern int cw_in_radio_operational_state(struct cw_Conn *conn, struct cw_action_in *a,
uint8_t * data, int len, struct sockaddr *from);
/*
int cw_process_element(struct conn * conn,
int cw_process_element(struct cw_Conn * conn,
struct cw_MsgData * msgdata, int proto, int vendor,
uint8_t * elem, int max_len);
*/
@ -497,7 +503,7 @@ int cw_process_element(struct cw_ElemHandlerParams *params,
#define cw_out_capwap_local_ip_address_7 cw_out_wtp_ip_address
void cw_init_request(struct conn *conn, int msg_id);
void cw_init_request(struct cw_Conn *conn, int msg_id);
/**
@ -522,16 +528,16 @@ int cw_put_elem_radio_administrative_state(uint8_t * dst, int rid, int state);
int cw_put_local_ip_address(uint8_t *dst, int id, int ipv_id, int ipv6_id,
uint8_t *src, int len);
int cw_detect_nat(struct conn *conn);
int cw_detect_nat(struct cw_ElemHandlerParams *conn);
uint8_t *cw_init_data_keep_alive_msg(uint8_t * buffer,uint8_t *rmac);
/*int cw_out_radio_generic(struct conn *conn, struct cw_action_out *a, uint8_t * dst);*/
/*int cw_out_radio_generic(struct cw_Conn *conn, struct cw_action_out *a, uint8_t * dst);*/
int cw_put_elem_session_id(uint8_t *dst, uint8_t *session_id, int len);
int cw_result_is_ok( int rc );
int cw_put_msg(struct conn *conn, uint8_t * rawout);
int cw_assemble_message(struct cw_Conn *conn, uint8_t * rawout);
/**
* @}
@ -542,6 +548,16 @@ int cw_put_msg(struct conn *conn, uint8_t * rawout);
char *cw_strdup(const char *s);
int cw_stricmp(char const *a, char const *b);
int cw_write_header(struct cw_ElemHandler * handler, uint8_t * dst, int len);
int cw_header_len(struct cw_ElemHandler * handler);
int cw_compose_message(struct cw_Conn *conn, uint8_t * rawout);
int cw_put_ac_status(uint8_t *dst, cw_Cfg_t ** cfg_list, const char * parent_key);
int cw_put_descriptor_subelem (uint8_t *dst, cw_Cfg_t ** cfg_list,
int subelem_id, const char * parent_key );
int cw_send_request(struct cw_Conn *conn,int msg_id);
/**
*@}

View File

@ -3,12 +3,15 @@
#include "dbg.h"
#include "log.h"
int cw_check_missing_mand(struct cw_MsgData *msgdata, mavl_t keys )
int cw_check_missing_mand(struct cw_MsgData *msgdata, mavl_t keys, mavl_t handlers_by_key )
{
mlistelem_t * elem;
char *mandkey, *result;
mlist_t missing;
int count;
if (msgdata==NULL)
return 0;
missing = mlist_create_conststr();
if (missing==NULL){
@ -26,7 +29,22 @@ int cw_check_missing_mand(struct cw_MsgData *msgdata, mavl_t keys )
}
mlist_foreach(elem,missing){
cw_dbg(DBG_RFC," Missing mandatory message element: %s", mlistelem_get_str(elem));
const char * str;
struct cw_ElemHandler search, *result;
str = mlistelem_get_str(elem);
search.key = str;
result = mavl_get(handlers_by_key,&search);
if (result == NULL){
cw_log(LOG_ERR,"Can't find handler for for key %s",str);
}
else {
cw_dbg(DBG_RFC,"Missing mandatory message element: %s: %d - %s",
str,result->id, result->name);
}
}
count = missing->count;

View File

@ -18,9 +18,9 @@ void cw_dbg_set_level (int level, int on)
break;
default:
if (on)
cw_dbg_opt_level |= (1 << (level));
cw_dbg_opt_level |= (level);
else
cw_dbg_opt_level &= (0xffffffff) ^ (1 << (level));
cw_dbg_opt_level &= (0xffffffff) ^ (level);
}
}

View File

@ -9,6 +9,7 @@ int cw_dbg_set_level_from_str(const char *level)
switch(*level){
case '-':
case '!':
case '~':
on =0;
slevel=level+1;
break;

View File

@ -10,15 +10,13 @@
* @retval 1 NAT detected
* @retval 0 no NAT was detected
*/
int cw_detect_nat(struct conn *conn)
int cw_detect_nat(struct cw_ElemHandlerParams *params)
{
cw_KTV_t * result;
const char * remote_str;
char local_str[128];
char remote_str[128];
result = cw_ktv_get(conn->remote_cfg,"capwap-local-ip-address",CW_TYPE_IPADDRESS);
if (result == NULL){
remote_str = cw_cfg_get(params->cfg,"capwap-local-ip-address",NULL);
if (remote_str == NULL){
cw_dbg(DBG_WARN,"Can't detect NAT. No local IP from peer received.");
return 0;
}
@ -26,8 +24,7 @@ int cw_detect_nat(struct conn *conn)
/* convert remote connected and sent ip addresse to
* strings */
sock_addrtostr((struct sockaddr*)&conn->addr,local_str,128,0);
result->type->to_str(result,remote_str,128);
sock_addrtostr((struct sockaddr*)&(params->conn->addr),local_str,128,0);
/* if connected and sent address is the same, there is
@ -37,3 +34,4 @@ int cw_detect_nat(struct conn *conn)
/* otherwise ther must be something between AC and WTP */
return 1;
}

View File

@ -35,10 +35,6 @@ int cw_format_version(char *s, const uint8_t * version, int len)
}
rs += sprintf(s + rs, ")");
}
/*
vendor = bstrv_get_vendor_id(ver);
rs += sprintf(s + rs, ", Vendor Id: %d, %s", vendor, cw_strvendor(vendor));
*/
return rs;
}

View File

@ -9,7 +9,7 @@
int cw_in_capwap_local_ipv6_address(struct conn *conn, struct cw_action_in *a,
int cw_in_capwap_local_ipv6_address(struct cw_Conn *conn, struct cw_action_in *a,
uint8_t * data, int len,struct sockaddr *from)
{
struct sockaddr_in6 addr;

View File

@ -1,32 +0,0 @@
#include "capwap.h"
#include "intavltree.h"
#include "dbg.h"
#include "log.h"
int cw_in_check_cfg_update_req(struct conn *conn, struct cw_action_in *a, uint8_t * data,
int len,struct sockaddr *from)
{
/*cw_action_in_t * mlist[60];*/
/* Check for mandatory elements */
/* int n = cw_check_missing_mand(mlist,conn,a);
if (n) {
if ( conn->strict_capwap ){
cw_dbg_missing_mand(DBG_MSG_ERR,conn,mlist,n,a);
conn->capwap_state=CAPWAP_STATE_JOIN;
return CW_RESULT_MISSING_MAND_ELEM;
}
cw_dbg_missing_mand(DBG_RFC,conn,mlist,n,a);
}
*/
/* set result code to ok and change to configure state */
/*mbag_set_dword(conn->outgoing,CW_ITEM_RESULT_CODE,0);*/
return 0;
}

View File

@ -1,43 +0,0 @@
#include "capwap.h"
#include "intavltree.h"
#include "log.h"
#include "dbg.h"
#include "sock.h"
int cw_in_check_disc_req(struct conn *conn, struct cw_action_in *a, uint8_t * data,
int len,struct sockaddr *from)
{
/*
char sock_buf[SOCK_ADDR_BUFSIZE];
cw_action_in_t *mlist[120];
int n = cw_check_missing_mand(mlist, conn, a);
conn->capwap_state = CW_STATE_NONE;
if (n && conn->strict_capwap) {
cw_dbg_missing_mand(DBG_MSG_ERR, conn, mlist, n, a);
// if mandatory elements are missing, in strict
// mode send no discovery response
cw_dbg(DBG_MSG_ERR,
"Ignoring Discovery Request from %s - missing mandatory elements.",
sock_addr2str(from,sock_buf));
return -1;
}
if ( n ) {
// put a warning here
cw_dbg_missing_mand(DBG_RFC, conn, mlist, n, a);
}
// ok, send response
conn->capwap_state = CAPWAP_STATE_JOIN;
*/
return 0;
}

View File

@ -1,44 +0,0 @@
#include "capwap.h"
#include "intavltree.h"
#include "dbg.h"
#include "log.h"
#include "format.h"
#include "connlist.h"
int cw_in_check_join_req(struct conn *conn, struct cw_action_in *a, uint8_t * data,
int len,struct sockaddr *from)
{
/*
cw_action_in_t * mlist[60];
//Check for mandatory elements
int n = cw_check_missing_mand(mlist,conn,a);
if (n) {
if ( conn->strict_capwap ){
cw_dbg_missing_mand(DBG_MSG_ERR,conn,mlist,n,a);
conn->capwap_state=CAPWAP_STATE_JOIN;
return CW_RESULT_MISSING_MAND_ELEM;
}
cw_dbg_missing_mand(DBG_RFC,conn,mlist,n,a);
}
connlist_lock(conn->connlist);
struct conn *cc = connlist_get_by_session_id(conn->connlist,conn);
if (!cc){
connlist_add_by_session_id(conn->connlist,conn);
}
connlist_unlock(conn->connlist);
if (cc){
cw_dbg(DBG_ELEM_ERR,"Session already in use %s",format_bin2hex(conn->session_id,16));
conn->capwap_state=CAPWAP_STATE_JOIN;
return CW_RESULT_JOIN_FAILURE_SESSION_ALREADY_IN_USE;
}
// set result code to ok and change to configure state
mbag_set_dword(conn->outgoing,CW_ITEM_RESULT_CODE,0);
conn->capwap_state = CW_STATE_CONFIGURE;
*/
return 0;
}

View File

@ -1,47 +0,0 @@
#include <errno.h>
#include "capwap.h"
#include "intavltree.h"
#include "dbg.h"
#include "log.h"
int cw_in_check_join_resp(struct conn *conn, struct cw_action_in *a, uint8_t * data,
int len,struct sockaddr *from)
{
/*
cw_action_in_t * mlist[60];
mbag_item_t * jresult = mbag_get(conn->incomming,CW_ITEM_RESULT_CODE);
if (jresult ) {
if (!cw_result_is_ok(jresult->u2.dword)){
return jresult->u2.dword;
}
}
// Check for mandatory elements
int n = cw_check_missing_mand(mlist,conn,a);
if (n && conn->strict_capwap) {
cw_dbg_missing_mand(DBG_MSG_ERR,conn,mlist,n,a);
conn->capwap_state=CAPWAP_STATE_JOIN;
errno=EAGAIN;
return -1; //CW_RESULT_MISSING_MAND_ELEM;
}
if (n){
cw_dbg_missing_mand(DBG_RFC,conn,mlist,n,a);
}
if ( jresult ) {
return jresult->u2.dword;
}
// set result code to ok and change to configure state
// mbag_set_dword(conn->outgoing,CW_ITEM_RESULT_CODE,0);
*/
return 0;
}

View File

@ -1,23 +1,37 @@
#include "capwap.h"
#include "msgset.h"
#include "ktv.h"
#include "val.h"
#include "log.h"
#include "dbg.h"
int cw_in_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params,
uint8_t * elem_data, int elem_len)
{
cw_KTV_t * result;
cw_Type_t * type;
type = (cw_Type_t*)handler->type;
char mkey[CW_CFG_MAX_KEY_LEN];
const char *key;
if (!handler->type){
if (!type){
cw_log(LOG_ERR,"Can't handle element: %s, no type defined",handler->name);
return CAPWAP_RESULT_UNRECOGNIZED_MESSAGE_ELEMENT;
}
if (handler->mkkey != NULL){
handler->mkkey(handler->key,elem_data,elem_len, mkey);
key = mkey;
}
else{
key = handler->key;
}
result = cw_ktv_add(params->conn->remote_cfg, handler->key,
handler->type,NULL, elem_data,elem_len);
params->elem=result;
/* cw_dbg(DBG_X, "READ: %s / %s",type->name,key);*/
type->read(params->cfg, key,elem_data,elem_len,handler->param);
return CAPWAP_RESULT_SUCCESS;
}

View File

@ -1,7 +1,7 @@
#include "cw.h"
static const cw_KTVEnum_t * get_enum(const cw_KTVEnum_t * e, int val){
static const cw_ValEnum_t * get_enum(const cw_ValEnum_t * e, int val){
int i;
for (i=0; e[i].type != NULL; i++ ){
if (e[i].value==val){
@ -16,8 +16,8 @@ int cw_in_generic_enum(struct cw_ElemHandler * handler, struct cw_ElemHandlerPar
uint8_t * elem_data, int elem_len)
{
int val;
const cw_KTVEnum_t * e;
char key[CW_KTV_MAX_KEY_LEN];
const cw_ValEnum_t * e;
char key[CW_CFG_MAX_KEY_LEN];
struct cw_ElemHandler thandler;
val = cw_get_byte(elem_data+1);
@ -33,4 +33,4 @@ int cw_in_generic_enum(struct cw_ElemHandler * handler, struct cw_ElemHandlerPar
thandler.key=key;
return e->fun_in(&thandler,params,elem_data,elem_len-1);
}
}

View File

@ -1,9 +1,11 @@
#include "cw.h"
#include "cfg.h"
static const cw_KTVEnum_t * get_enum(const cw_KTVEnum_t * e, int val){
static const cw_ValEnum_t * get_enum(const cw_ValEnum_t * e, int val){
int i;
for (i=0; e[i].type != NULL; i++ ){
if (e[i].value==val){
@ -18,10 +20,10 @@ int cw_in_generic_indexed_enum(struct cw_ElemHandler * handler, struct cw_ElemHa
{
int val;
int l,f;
const cw_KTVEnum_t * e;
const cw_KTVIndexed_t * ie;
const cw_ValEnum_t * e;
const cw_ValIndexed_t * ie;
char key[CW_KTV_MAX_KEY_LEN];
char key[CW_CFG_MAX_KEY_LEN];
struct cw_ElemHandler thandler;
ie = handler->type;
@ -46,8 +48,11 @@ int cw_in_generic_indexed_enum(struct cw_ElemHandler * handler, struct cw_ElemHa
}
memset(&thandler,0,sizeof(thandler));
thandler.type=e->type;
thandler.key=key;
thandler.type=e->type;
thandler.param=e->param;
return e->fun_in(&thandler,params,elem_data+f,elem_len-l);
}
}

View File

@ -1,14 +1,18 @@
#include "capwap.h"
#include "msgset.h"
#include "ktv.h"
#include "val.h"
#include "log.h"
#include "dbg.h"
int cw_in_generic_struct(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params,
uint8_t * elem_data, int elem_len)
{
const char * key;
char tmpkey[CW_KTV_MAX_KEY_LEN];
cw_dbg(DBG_X,"STRUCT KEY: %s",handler->key);
stop();
/* const char * key;
char tmpkey[CW_CFG_MAX_KEY_LEN];
if (handler->mkkey != NULL){
handler->mkkey(key,elem_data,elem_len, tmpkey);
@ -18,16 +22,15 @@ int cw_in_generic_struct(struct cw_ElemHandler * handler, struct cw_ElemHandlerP
key = handler->key;
}
/* int (*mkkey)(struct cw_ElemHandler * handler, char *dst, struct cw_ElemHandlerParams * params,
uint8_t*data, int len);
*/
//printf("CW_IN_GENERIC STRUCT: %s\n",key);
if (!handler->type){
cw_log(LOG_ERR,"Can't handle element: %s, no type defined",handler->name);
return CAPWAP_RESULT_UNRECOGNIZED_MESSAGE_ELEMENT;
}
cw_ktv_read_struct(params->conn->remote_cfg,handler->type,key,elem_data,elem_len);
cw_ktv_read_struct(params->cfg,handler->type,key,elem_data,elem_len);
*/
return CAPWAP_RESULT_SUCCESS;
}

View File

@ -1,14 +1,17 @@
#include "cw.h"
#include "dbg.h"
int cw_in_generic_with_index(struct cw_ElemHandler *eh,
struct cw_ElemHandlerParams *params,
uint8_t * data, int len)
{
char key[CW_KTV_MAX_KEY_LEN];
char key[CW_CFG_MAX_KEY_LEN];
int idx;
struct cw_Type * type = (struct cw_Type*)eh->type;
idx = cw_get_byte(data);
sprintf(key,"%s.%d",eh->key,idx);
cw_ktv_add(params->conn->remote_cfg,key,eh->type,NULL,data+1,len-1);
// cw_cfg_add(params->cfg,key,eh->type,NULL,data+1,len-1);
type->read(params->cfg,key,data+1,len-1,eh->param);
return 1;
}

View File

@ -1,11 +1,14 @@
#include "cw.h"
#include "log.h"
#include "dbg.h"
int cw_in_idx_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params,
uint8_t * elem_data, int elem_len)
{
stop();
/*
char key[CW_KTV_MAX_KEY_LEN];
cw_KTV_t * result;
cw_Val_t * result;
int idx;
if (!handler->type){
@ -16,10 +19,10 @@ int cw_in_idx_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerPara
idx=cw_get_byte(elem_data);
sprintf(key,handler->key,idx);
result = cw_ktv_add(params->conn->remote_cfg, key,
result = cw_ktv_add(params->cfg, key,
handler->type, NULL, elem_data+1,elem_len-1);
params->elem=result;
// params->elem=result;
*/
return CAPWAP_RESULT_SUCCESS;
}

View File

@ -1,15 +1,21 @@
#include "capwap.h"
#include "msgset.h"
#include "ktv.h"
#include "val.h"
#include "log.h"
#include "cw.h"
#include "dbg.h"
int cw_in_idx_generic_struct(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params,
uint8_t * elem_data, int elem_len)
{
char key[CW_KTV_MAX_KEY_LEN];
char key[CW_CFG_MAX_KEY_LEN];
int idx;
cw_dbg(DBG_X,"Fix cw_in_idx_generic_struct");
stop();
if (!handler->type){
cw_log(LOG_ERR,"Can't handle element: %s, no type defined",handler->name);
@ -19,7 +25,7 @@ int cw_in_idx_generic_struct(struct cw_ElemHandler * handler, struct cw_ElemHand
idx = cw_get_byte(elem_data);
sprintf(key, handler->key, idx);
cw_ktv_read_struct(params->conn->remote_cfg,handler->type,key,elem_data+1,elem_len-1);
cw_ktv_read_struct(params->cfg,handler->type,key,elem_data+1,elem_len-1);
return CAPWAP_RESULT_SUCCESS;
}

View File

@ -1,14 +1,19 @@
#include "capwap.h"
#include "msgset.h"
#include "ktv.h"
#include "val.h"
#include "log.h"
#include "cw.h"
#include "dbg.h"
int cw_in_radio_generic_struct(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params,
uint8_t * elem_data, int elem_len)
{
char key[CW_KTV_MAX_KEY_LEN];
stop();
char key[CW_CFG_MAX_KEY_LEN];
int radio;
if (!handler->type){
@ -19,7 +24,7 @@ int cw_in_radio_generic_struct(struct cw_ElemHandler * handler, struct cw_ElemHa
radio = cw_get_byte(elem_data);
sprintf(key,"radio.%d/%s",radio,handler->key);
cw_ktv_read_struct(params->conn->remote_cfg,handler->type,key,elem_data+1,elem_len-1);
cw_ktv_read_struct(params->cfg,handler->type,key,elem_data+1,elem_len-1);
/*params->elem=result;*/

View File

@ -21,7 +21,7 @@
#include "log.h"
int cw_in_wtp_reboot_statistics(struct conn *conn, struct cw_action_in *a, uint8_t * data,
int cw_in_wtp_reboot_statistics(struct cw_Conn *conn, struct cw_action_in *a, uint8_t * data,
int len, struct sockaddr *from)
{
/*

View File

@ -111,7 +111,7 @@ int cw_set_hdr_rmac(uint8_t * th, bstr_t rmac)
memcpy(cw_get_hdr_rmac(th), rmac, rmac_len + 1);
cw_set_hdr_flags(th, CAPWAP_FLAG_HDR_M, 1);
hlen = 4 + rmac_len / 4;
hlen = 2 + rmac_len / 4;
if (rmac_len % 4 != 0) {
hlen++;

View File

@ -1,44 +0,0 @@
#include "ktv.h"
#include "cw.h"
#include "log.h"
#include "dbg.h"
cw_KTV_t * cw_ktv_add(mavl_t kvtstore, const char *key, const struct cw_Type *type,
const void * valguard,
const uint8_t * data, int len)
{
cw_KTV_t mdata, *mresult;
int exists;
mdata.key=cw_strdup(key);
mdata.valguard=valguard;
if (!mdata.key){
cw_log(LOG_ERR, "Can't allocate memory for KTV key %s: %s",
key,strerror(errno));
return NULL;
}
mresult = type->get(&mdata,data,len);
if (!mresult){
cw_log(LOG_ERR, "Can't create kvstore element for key %s of type %s: %s",
key,type->name, strerror(errno));
free(mdata.key);
return NULL;
}
mavl_del(kvtstore,&mdata);
mresult = mavl_add(kvtstore, &mdata, &exists);
if (exists){
cw_log(LOG_ERR, "Element already exists %s", key);
/* element already exists */
free(mdata.key);
if (type->del)
type->del(&mdata);
return mresult;
}
return mresult;
}

View File

@ -1,45 +0,0 @@
#include "ktv.h"
#include "cw.h"
#include "log.h"
#include "dbg.h"
const char * cw_ktv_add_from_str(mavl_t kvtstore, const char *key,
const struct cw_Type *type,
const void * valguard,
const char * str)
{
cw_KTV_t mdata, *mresult;
int exists;
/* cw_dbg(DBG_ELEM,"KVStore (%p,%d) add elem (%s): %s", kvstore, kvstore->count,
type->name, key );
*/
mdata.key=cw_strdup(key);
mdata.valguard=valguard;
if (!mdata.key){
cw_log(LOG_ERR, "Can't allocate memory for key %s: %s",
key,strerror(errno));
return NULL;
}
mresult = type->from_str(&mdata,str);
if (!mresult){
cw_log(LOG_ERR, "Can't create kvstore element for key %s of type %s: %s",
key,type->name, strerror(errno));
free(mdata.key);
return NULL;
}
mresult = mavl_add(kvtstore, &mdata, &exists);
if (exists){
cw_log(LOG_ERR, "Element already exists %s", key);
/* element already exists */
free(mdata.key);
if (type->del)
type->del(&mdata);
return key;
}
return mdata.key;
}

Some files were not shown because too many files have changed in this diff Show More