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

Get it work under FreeBSD

Browse Source 
FossilOrigin-Name: dbf6c9aef90847e18cdbac6b9212e1195f702f380759bd9abf41d6e247fe6df5
This commit is contained in:
7u83@mail.ru 2020-03-07 08:34:33 +00:00
parent b2dcf4e8ee
commit a37caf0ae5
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CWConfig.mak
View File

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

2
src/WtpConfig.mak
View File

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

4
src/cw/dtls_openssl.c
View File

@ -329,10 +329,10 @@ struct dtls_openssl_data * dtls_openssl_data_create(struct conn * conn, const SS
} }
/* set dtls psk if exists */ /* set dtls psk if exists */
if (conn->dtls_psk) /* if (conn->dtls_psk)
SSL_CTX_set_psk_server_callback( d->ctx, psk_server_cb); SSL_CTX_set_psk_server_callback( d->ctx, psk_server_cb);
*/
/* setup certificates */ /* setup certificates */
rc = dtls_openssl_set_certs(conn,d); rc = dtls_openssl_set_certs(conn,d);

6
src/wtp/Makefile
View File

@ -12,7 +12,7 @@ LIBARCHDIR := $(LIBDIR)/$(ARCH)
OBJDIR := ../../obj/wtp/$(ARCH) OBJDIR := ../../obj/wtp/$(ARCH)
EXENAME := ./wtp EXENAME := ./wtp
LIBS := -lcw LIBS := -lcw -lnettle
#STATICLIBS := $(LIBDIR)/$(ARCH)/libcw.a #STATICLIBS := $(LIBDIR)/$(ARCH)/libcw.a
LDFLAGS += -L$(LIBARCHDIR) LDFLAGS += -L$(LIBARCHDIR)
@ -48,8 +48,8 @@ $(OBJDIR)/%.o:%.c
@$(CC) -c $(CFLAGS) $< -o $@ @$(CC) -c $(CFLAGS) $< -o $@
$(EXENAME): $(OBJS) $(EXENAME): $(OBJS)
@echo " $(LD) $(EXENAME)" echo " $(LD) $(EXENAME)"
@$(LD) $(LDFLAGS) -o $(EXENAME) $(OBJS) $(LIBS) $(STATICLIBS) $(LD) $(LDFLAGS) -o $(EXENAME) $(OBJS) $(LIBS) $(STATICLIBS)
clean: clean:

4
src/wtp/cisco.ktv
View File

@ -99,9 +99,9 @@ cisco/rouge-and-mss/tcp-adjust-mss :Word: 0
cisco/rouge-detection/rest :Bstr16: .x000aff800000 cisco/rouge-detection/rest :Bstr16: .x000aff800000
cisco/rouge-detection/rouge-detection :Bool: false cisco/rouge-detection/rouge-detection :Bool: false
cisco/sig-toogle :Bool: true cisco/sig-toogle :Bool: true
cisco/ssl-certfile :Str: ../../ssl/certs/wtpc.crt cisco/ssl-certfile :Str: ../../ssl/certs/wtp.crt
cisco/ssl-cipher :Str: ALL cisco/ssl-cipher :Str: ALL
cisco/ssl-keyfile :Str: ../../ssl/certs/wtpc.key cisco/ssl-keyfile :Str: ../../ssl/certs/wtp.key
cisco/vlan/id :Word: 0 cisco/vlan/id :Word: 0
cisco/vlan/tagging :Bool: false cisco/vlan/tagging :Bool: false
cisco/wtp-board-data/card-id :Word: 0 cisco/wtp-board-data/card-id :Word: 0

2
src/wtp/wtp_main.c
View File

@ -194,7 +194,7 @@ exit(0);
cw_discovery_init_results(&dis); cw_discovery_init_results(&dis);
/*cw_run_discovery(conn, "255.255.255.255","192.168.56.1", &dis);*/ /*cw_run_discovery(conn, "255.255.255.255","192.168.56.1", &dis);*/
/* cw_run_discovery(conn, "255.255.255.255",NULL, &dis);*/ /* cw_run_discovery(conn, "255.255.255.255",NULL, &dis);*/
cw_run_discovery(conn, "255.255.255.255","192.168.0.14", &dis); cw_run_discovery(conn, "192.168.0.161","192.168.0.29", &dis);
cw_dbg_ktv_dump(dis.prio_ip, DBG_INFO, "=== IP list ===", "IP", "=== END IP List ==="); cw_dbg_ktv_dump(dis.prio_ip, DBG_INFO, "=== IP list ===", "IP", "=== END IP List ===");

2
ssl/mkcert.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh
KEYSIZE=2048 KEYSIZE=2048
#OPENSSL="../src/contrib/openssl-1.0.1i/apps/openssl" #OPENSSL="../src/contrib/openssl-1.0.1i/apps/openssl"