mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-01-22 05:11:29 -05:00
6435357c07
the rewrite of the retroshare core networking stack. This check-in commits the changes to the pqi code, and provides the majority of the improvements. (1) Introduced new interfaces for DHT and UPnP abstraction: p3dhtmgr.h, p3upnpmgr.h (2) Introduces abstraction for Authentication: p3authmgr.h (3) New Connection Manager to coordinate networking code: p3connmgr.h (4) New Configuration Manager: p3cfgmgr.h This library has been significantly modified to support DHT synced connections to enable connections between Firewalled Friends. The connection code has been rewritten within a new framework, which should make extensions easier to code. Also removed significant amount of old code relating to Tunnels, Channels etc. This will be recycled later as higher level services that should not be part of the core networking library. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@306 b45a01b8-16f6-495d-af2f-9b41ad6348cc
105 lines
2.4 KiB
Makefile
105 lines
2.4 KiB
Makefile
|
|
RS_TOP_DIR = ..
|
|
include ../make.opt
|
|
|
|
# All the executables that should be generated.
|
|
EXECS = dht_test conn_test # test_p3items
|
|
|
|
BASE_OBJ = pqi_base.o pqidebug.o pqisecurity.o pqinetwork.o
|
|
LOOP_OBJ = pqiloopback.o
|
|
STREAM_OBJ = pqistreamer.o pqiarchive.o pqibin.o
|
|
MGR_OBJ = pqimonitor.o p3dhtmgr.o p3connmgr.o p3cfgmgr.o p3authmgr.o
|
|
GRP_OBJ = pqiperson.o pqihandler.o pqiservice.o pqipersongrp.o
|
|
|
|
ifdef PQI_USE_XPGP
|
|
SSL_OBJ = authxpgp.o
|
|
#xpgpcert.o
|
|
# Disabled for release... EXECS += p3supernode
|
|
else
|
|
SSL_OBJ = sslcert.o
|
|
endif
|
|
|
|
SSL_OBJ += pqissl.o pqissllistener.o pqisslpersongrp.o
|
|
UDP_OBJ = pqissludp.o
|
|
|
|
# Old code - no longer used!
|
|
#OLD_OBJ = pqipacket.o p3loopback.o pqi.o
|
|
#TUNN_OBJ = pqitunnel.o pqitunneltst.o
|
|
#DISC_OBJ = discItem.o p3disc.o
|
|
#UDP_OBJ = pqistunner.o pqiudpproxy.o pqissludp.o pqitunnelproxyudp.o
|
|
#PRXY_OBJ = pqiproxy.o pqitunnelproxy.o
|
|
#CHAN_OBJ = p3channel.o pqichannel.o
|
|
#SN_OBJ = pqisupernode.o
|
|
|
|
OBJ = $(BASE_OBJ) $(LOOP_OBJ) \
|
|
$(STREAM_OBJ) \
|
|
$(MGR_OBJ) \
|
|
$(SSL_OBJ) \
|
|
$(UDP_OBJ) \
|
|
$(GRP_OBJ)
|
|
|
|
# Linux only parts.
|
|
ifeq ($(OS),Linux)
|
|
# OBJ += $(SN_OBJ)
|
|
endif
|
|
|
|
BASE_HDR = pqi_base.h pqisecurity.h pqinetwork.h \
|
|
pqidebug.h pqistreamer.h pqiarchive.h pqiindic.h pqibin.h
|
|
LOOP_HDR = pqiloopback.h
|
|
SSL_HDR = pqissl.h pqissllistener.h xpgpcert.h
|
|
GPR_HDR = pqihandler.h pqiperson.h pqiservice.h pqipersongrp.h
|
|
STREAM_HDR = pqistreamer.h pqiarchive.h
|
|
|
|
OLD_HDR = pqipacket.h pqi_data.h p3loopback.h pqi.h
|
|
TUNN_HDR = pqitunnel.h pqitunneltst.h
|
|
DISC_HDR = discItem.h p3disc.h
|
|
UDP_HDR = pqistunner.h pqiudpproxy.h pqissludp.h pqitunnelproxyudp.h
|
|
PRXY_HDR = pqitunnelproxy.h pqiproxy.h
|
|
CHAN_HDR = pqichannel.h p3channel.h
|
|
SN_HDR = pqisupernode.h
|
|
|
|
HDR = $(BASE_HDR) $(LOOP_HDR) $(GRP_HDR) $(SSL_HDR) $(STREAM_HDR)
|
|
|
|
#$(DISC_HDR) $(TUNN_HDR)
|
|
#$(CHAN_HDR) $(PRXY_HDR) $(UDP_HDR)
|
|
|
|
LIBPQIA = $(LIBDIR)/libpqi.a
|
|
LIBPQISO = $(LIBDIR)/libpqi.so
|
|
|
|
# decide on output format...... Lib for Unix, Objs for windows,
|
|
ifeq ($(OS),Linux)
|
|
|
|
all : librs $(EXECS)
|
|
|
|
else
|
|
|
|
all : librs
|
|
|
|
endif
|
|
|
|
librs: $(OBJ)
|
|
$(AR) r $(LIBRS) $(OBJ)
|
|
$(RANLIB) $(LIBRS)
|
|
|
|
$(OBJ) : $(HDR)
|
|
|
|
#p3supernode: p3supernode.o librs
|
|
# $(CC) $(CFLAGS) -o p3supernode p3supernode.o $(RSLIBS)
|
|
|
|
dht_test: dht_test.o librs
|
|
$(CC) $(CFLAGS) -o dht_test dht_test.o $(RSLIBS)
|
|
|
|
conn_test: conn_test.o librs
|
|
$(CC) $(CFLAGS) -o conn_test conn_test.o $(RSLIBS)
|
|
|
|
.cc.o:
|
|
$(CC) $(CFLAGS) -c $<
|
|
|
|
clean:
|
|
-/bin/rm $(OBJ)
|
|
|
|
clobber: clean
|
|
-/bin/rm $(EXECS) $(LIBPQIA) $(LIBPQISO)
|
|
|
|
|