7u83/freewtp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[ac] drop old libjson compatibility

Browse Source 
json-c >= 0.11 is required now
This commit is contained in:
Andreas Schultz 2016-03-14 11:47:43 +01:00
parent 64012e792c
commit 7293ce43da
6 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@ -183,15 +183,10 @@ if test "${enable_ac}" = "yes"; then
test "x${have_wolfssl_ssl}" != "xyes" && AC_MSG_ERROR(You need the wolfssl library) test "x${have_wolfssl_ssl}" != "xyes" && AC_MSG_ERROR(You need the wolfssl library)
PKG_CHECK_MODULES( PKG_CHECK_MODULES(
[LIBJSON], [LIBJSON],
[json-c >= 0.11], [json-c >= 0.11],
[], [],
[PKG_CHECK_MODULES( [AC_MSG_ERROR(You need the libjson)]
[LIBJSON],
[json >= 0.9],
[],
[AC_MSG_ERROR(You need the libjson)]
)]
) )
# Check XML2 library # Check XML2 library

2
src/ac/ac.h
View File

@ -14,7 +14,7 @@
#include <pthread.h> #include <pthread.h>
#include <linux/if_ether.h> #include <linux/if_ether.h>
#include <json/json.h> #include <json-c/json.h>
#include <ac_kmod.h> #include <ac_kmod.h>

2
src/ac/ac_dfa_configure.c
View File

@ -4,7 +4,7 @@
#include "ac_session.h" #include "ac_session.h"
#include "ac_json.h" #include "ac_json.h"
#include "ac_wlans.h" #include "ac_wlans.h"
#include <json/json.h> #include <json-c/json.h>
#include <arpa/inet.h> #include <arpa/inet.h>
/* */ /* */

2
src/ac/ac_dfa_datacheck.c
View File

@ -3,7 +3,7 @@
#include "capwap_array.h" #include "capwap_array.h"
#include "ac_session.h" #include "ac_session.h"
#include "ac_json.h" #include "ac_json.h"
#include <json/json.h> #include <json-c/json.h>
/* */ /* */
static struct ac_soap_response* ac_dfa_state_datacheck_parsing_request(struct ac_session_t* session, struct capwap_parsed_packet* packet) { static struct ac_soap_response* ac_dfa_state_datacheck_parsing_request(struct ac_session_t* session, struct capwap_parsed_packet* packet) {

2
src/ac/ac_dfa_join.c
View File

@ -4,7 +4,7 @@
#include "ac_session.h" #include "ac_session.h"
#include "ac_backend.h" #include "ac_backend.h"
#include "ac_json.h" #include "ac_json.h"
#include <json/json.h> #include <json-c/json.h>
#include <arpa/inet.h> #include <arpa/inet.h>
/* */ /* */

2
src/ac/ac_json.h
View File

@ -2,7 +2,7 @@
#define __AC_JSON_HEADER__ #define __AC_JSON_HEADER__
#include "capwap_array.h" #include "capwap_array.h"
#include <json/json.h> #include <json-c/json.h>
#define IEEE80211_BINDING_JSON_ROOT "WTPRadio" #define IEEE80211_BINDING_JSON_ROOT "WTPRadio"