a322d1799b
- Add patch to fix highly-parallel build (e.g. -j16) - Add additional compiler warning flags to highlight questionable code - Add patch to fix comparisons between signed and unsigned integers - Add patch to fix const usage - Add patch to fix missing field initializers - Add patch to suppress warnings about possibly unused variables - Add patch to fix declarations that are not prototypes - Add patch to fix warnings about nested externs - Add patch to fix dubious typecasts that violate strict-aliasing rules - Update the FSF address references and GPLv2 license text - Use default optimization level (-O2) again Some of these patches have already been accepted upstream, with the rest having been submitted for review.
24 lines
776 B
Diff
24 lines
776 B
Diff
diff -up pptp-1.7.2/pptp_gre.c.nested pptp-1.7.2/pptp_gre.c
|
|
--- pptp-1.7.2/pptp_gre.c.nested 2011-12-06 16:45:34.605691678 +0000
|
|
+++ pptp-1.7.2/pptp_gre.c 2011-12-06 19:07:14.169449813 +0000
|
|
@@ -23,6 +23,10 @@
|
|
#include "pqueue.h"
|
|
#include "test.h"
|
|
|
|
+/* globals from pptp.c */
|
|
+extern struct in_addr localbind;
|
|
+extern int rtmark;
|
|
+
|
|
#define PACKET_MAX 8196
|
|
/* test for a 32 bit counter overflow */
|
|
#define WRAPPED( curseq, lastseq) \
|
|
@@ -82,8 +86,6 @@ uint64_t time_now_usecs(void)
|
|
int pptp_gre_bind(struct in_addr inetaddr)
|
|
{
|
|
struct sockaddr_in src_addr, loc_addr;
|
|
- extern struct in_addr localbind;
|
|
- extern int rtmark;
|
|
int s = socket(AF_INET, SOCK_RAW, PPTP_PROTO);
|
|
if (s < 0) { warn("socket: %s", strerror(errno)); return -1; }
|
|
#ifdef SO_MARK
|