Menu
▾
▴
[pptpclient-commits] CVS: pptp-linux ChangeLog, 1.116, 1.117 Makefile, 1.47, 1.48 NEWS, 1.59, 1.60 routing.c, 1.1, 1.2
|
From: James C. <qu...@us...> - 2008-05-21 23:47:11
|
Update of /cvsroot/pptpclient/pptp-linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17229 Modified Files: ChangeLog Makefile NEWS routing.c Log Message: packaging fixes Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/ChangeLog,v retrieving revision 1.116 retrieving revision 1.117 diff -u -d -r1.116 -r1.117 --- ChangeLog 14 May 2008 06:32:52 -0000 1.116 +++ ChangeLog 21 May 2008 23:47:17 -0000 1.117 @@ -1,3 +1,10 @@ +Thu May 22 09:44:19 2008 James Cameron <qu...@us...> + + * routing.c: add config.h and use IP_BINARY. + + * Makefile (IP): add pointer to IP binary, store it in config.h, + and add dependencies to support parallel make and development. + Wed May 14 15:59:17 2008 James Cameron <qu...@us...> * pptp-1.7.2 released. Index: Makefile =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/Makefile,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- Makefile 14 May 2008 06:32:52 -0000 1.47 +++ Makefile 21 May 2008 23:47:17 -0000 1.48 @@ -3,8 +3,9 @@ RELEASE= ################################################################# -# CHANGE THIS LINE to point to the location of your pppd binary. +# CHANGE THIS LINE to point to the location of binaries PPPD = /usr/sbin/pppd +IP = /bin/ip ################################################################# BINDIR=$(DESTDIR)/usr/sbin @@ -47,6 +48,7 @@ echo "/* text added by Makefile target config.h */" > config.h echo "#define PPTP_LINUX_VERSION \"$(VERSION)$(RELEASE)\"" >> config.h echo "#define PPPD_BINARY \"$(PPPD)\"" >> config.h + echo "#define IP_BINARY \"$(IP)\"" >> config.h vector_test: vector_test.o vector.o $(CC) -o vector_test vector_test.o vector.o @@ -96,3 +98,71 @@ release: cp pptp_$(VERSION)-0_i386.deb $(WEB) cd $(WEB);make + +# The following include file dependencies were generated using +# "makedepend -w0 *.c", then manually removing out of tree entries. +# DO NOT DELETE + +dirutil.o: dirutil.h +orckit_quirks.o: pptp_msg.h +orckit_quirks.o: pptp_compat.h +orckit_quirks.o: pptp_options.h +orckit_quirks.o: pptp_ctrl.h +orckit_quirks.o: util.h +ppp_fcs.o: ppp_fcs.h +ppp_fcs.o: pptp_compat.h +pptp.o: config.h +pptp.o: pptp_callmgr.h +pptp.o: pptp_gre.h +pptp.o: pptp_compat.h +pptp.o: version.h +pptp.o: inststr.h +pptp.o: util.h +pptp.o: pptp_quirks.h +pptp.o: pptp_msg.h +pptp.o: pptp_ctrl.h +pptp.o: pqueue.h +pptp.o: pptp_options.h +pptp_callmgr.o: pptp_callmgr.h +pptp_callmgr.o: pptp_ctrl.h +pptp_callmgr.o: pptp_compat.h +pptp_callmgr.o: pptp_msg.h +pptp_callmgr.o: dirutil.h +pptp_callmgr.o: vector.h +pptp_callmgr.o: util.h +pptp_callmgr.o: routing.h +pptp_compat.o: pptp_compat.h +pptp_compat.o: util.h +pptp_ctrl.o: pptp_msg.h +pptp_ctrl.o: pptp_compat.h +pptp_ctrl.o: pptp_ctrl.h +pptp_ctrl.o: pptp_options.h +pptp_ctrl.o: vector.h +pptp_ctrl.o: util.h +pptp_ctrl.o: pptp_quirks.h +pptp_gre.o: ppp_fcs.h +pptp_gre.o: pptp_compat.h +pptp_gre.o: pptp_msg.h +pptp_gre.o: pptp_gre.h +pptp_gre.o: util.h +pptp_gre.o: pqueue.h +pptp_gre.o: test.h +pptp_quirks.o: orckit_quirks.h +pptp_quirks.o: pptp_options.h +pptp_quirks.o: pptp_ctrl.h +pptp_quirks.o: pptp_compat.h +pptp_quirks.o: pptp_msg.h +pptp_quirks.o: pptp_quirks.h +pqueue.o: util.h +pqueue.o: pqueue.h +routing.o: routing.h +test.o: util.h +test.o: test.h +util.o: util.h +vector.o: pptp_ctrl.h +vector.o: pptp_compat.h +vector.o: vector.h +vector_test.o: vector.h +vector_test.o: pptp_ctrl.h +vector_test.o: pptp_compat.h +version.o: config.h Index: NEWS =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/NEWS,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- NEWS 14 May 2008 06:32:52 -0000 1.59 +++ NEWS 21 May 2008 23:47:17 -0000 1.60 @@ -1,3 +1,6 @@ +- add IP_BINARY [Cameron] +- add include file build dependencies [Cameron] + Release 1.7.2: (14th May 2008) - port for Solaris 10/11 [Voronin] Index: routing.c =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/routing.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- routing.c 2 Aug 2006 07:07:37 -0000 1.1 +++ routing.c 21 May 2008 23:47:17 -0000 1.2 @@ -23,6 +23,7 @@ #include <stdio.h> #include <string.h> #include "routing.h" +#include "config.h" /* route to the server */ char *route; @@ -55,7 +56,7 @@ void routing_init(char *ip) { char buf[256]; - snprintf(buf, 255, "/bin/ip route get %s", ip); + snprintf(buf, 255, "%s route get %s", IP_BINARY, ip); FILE *p = popen(buf, "r"); fgets(buf, 255, p); /* TODO: check for failure of fgets */ @@ -66,14 +67,14 @@ void routing_start() { char buf[256]; - snprintf(buf, 255, "/bin/ip route replace %s", route); + snprintf(buf, 255, "%s route replace %s", IP_BINARY, route); FILE *p = popen(buf, "r"); pclose(p); } void routing_end() { char buf[256]; - snprintf(buf, 255, "/bin/ip route delete %s", route); + snprintf(buf, 255, "%s route delete %s", IP_BINARY, route); FILE *p = popen(buf, "r"); pclose(p); } |
