Merge branch 'master' of https://github.com/jselbie/stunserver

client/Makefile

@@ -15,6 +15,6 @@ clean:
 	rm -f $(PROJECT_OBJS) $(PROJECT_TARGET) 
 
 $(PROJECT_TARGET): $(PROJECT_OBJS)
-	$(LINK.cpp) -o $@ $^ $(LIB_PATH) $(LIBS) $(SOCKET_LIBS) $(CRYPTO_LIBS)
+	$(LINK.cpp) -o $@ $^ $(LIB_PATH) $(LIBS) $(SOCKET_LIBS) $(CRYPTO_LIBS) $(ASLR_FLAGS)
 
 

common.inc

@@ -17,6 +17,8 @@ CRYPTO_LIBS := -lcrypto
 
 #SOLARIS HACK
 UNAME := $(shell uname -s)
+UNAMEOS := $(shell uname -o)
+
 ifeq ($(UNAME),SunOS)
   SOCKET_LIBS := -lsocket -lnsl
 endif
@@ -26,6 +28,11 @@ ifeq ($(UNAME),Darwin)
   CRYPTO_LIBS :=
 endif
 
+#Cygwin hack for ASLR
+ifeq ($(UNAMEOS), Cygwin)
+  ASLR_FLAGS := -Xlinker --dynamicbase
+endif
+
 .PHONY: all clean debug
 
 %.hpp.gch: %.hpp

server/Makefile

@@ -14,6 +14,6 @@ clean:
 	rm -f $(PROJECT_OBJS) $(PROJECT_TARGET) 
 
 $(PROJECT_TARGET): $(PROJECT_OBJS)
-	$(LINK.cpp) -o $@ $^ $(LIB_PATH) $(LIBS) $(SOCKET_LIBS) $(CRYPTO_LIBS)
+	$(LINK.cpp) -o $@ $^ $(LIB_PATH) $(LIBS) $(SOCKET_LIBS) $(CRYPTO_LIBS) $(ASLR_FLAGS)
 
 

testcode/Makefile

@@ -14,7 +14,7 @@ clean:
 	rm -f $(PROJECT_OBJS) $(PROJECT_TARGET)
 
 $(PROJECT_TARGET): $(PROJECT_OBJS)
-	$(LINK.cpp) -o $@ $^ $(LIB_PATH) $(LIBS) $(SOCKET_LIBS) $(CRYPTO_LIBS)
+	$(LINK.cpp) -o $@ $^ $(LIB_PATH) $(LIBS) $(SOCKET_LIBS) $(CRYPTO_LIBS) $(ASLR_FLAGS)