cleaned up confusing names for different options

9 files changed, 22 insertions, 22 deletions

diff --git a/src/Makefile b/src/Makefile
index f71f6f2..7d54ac1 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -82,13 +82,13 @@ OBJS = tunDevice.o \
        $(OPENVPNDEPS) \
 			 $(SOCKETDEPS)
 
-ANYMUXOBJS = muxSocket.o \
-						 anymuxOptions.o \
+ANYCTROBJS = anyCtrSocket.o \
+						 anyCtrOptions.o \
 						 signalController.o \
 						 log.o \
 						 $(SOCKETDEPS)
 
-ANYCTROBJS = log.o \
+ANYCONFOBJS = log.o \
 						 buffer.o \
 						 keyDerivation.o \
 						 mpi.o \
@@ -103,7 +103,7 @@ ANYCTROBJS = log.o \
 						 anyrtpproxy/callIdQueue.o \
 						 syncRtpCommand.o \
 						 PracticalSocket.o \
-						 anyctrOptions.o \
+						 anyConfOptions.o \
 						 router.o \
 						 routingTable.o \
 						 seqWindow.o \
@@ -127,11 +127,11 @@ anytun: $(OBJS) anytun.o
 anytun-showtables: $(OBJS) anytun-showtables.o
 	$(LD) $(OBJS) anytun-showtables.o -o $@ $(LDFLAGS)
 
-anytun-config: $(ANYCTROBJS) anytun-config.o
-	$(LD) $(ANYCTROBJS) anytun-config.o -o $@ $(LDFLAGS)
+anytun-config: $(ANYCONFOBJS) anytun-config.o
+	$(LD) $(ANYCONFOBJS) anytun-config.o -o $@ $(LDFLAGS)
 
-anytun-controld: $(ANYMUXOBJS) anytun-controld.o
-	$(LD) $(ANYMUXOBJS) anytun-controld.o -o $@ $(LDFLAGS)
+anytun-controld: $(ANYCTROBJS) anytun-controld.o
+	$(LD) $(ANYCTROBJS) anytun-controld.o -o $@ $(LDFLAGS)
 
 tunDevice.o: tunDevice.cpp tunDevice.h
 	$(C++) $(CCFLAGS) $< -c
@@ -163,13 +163,13 @@ encryptedPacket.o: encryptedPacket.cpp encryptedPacket.h buffer.h
 cipher.o: cipher.cpp cipher.h buffer.h 
 	$(C++) $(CCFLAGS) $< -c
 
-muxSocket.o: muxSocket.cpp muxSocket.h 
+anyCtrSocket.o: anyCtrSocket.cpp anyCtrSocket.h 
 	$(C++) $(CCFLAGS) $< -c
 
-anymuxOptions.o: anymuxOptions.cpp anymuxOptions.h
+anyCtrOptions.o: anyCtrOptions.cpp anyCtrOptions.h
 	$(C++) $(CCFLAGS) $< -c
 
-anyctrOptions.o: anyctrOptions.cpp anyctrOptions.h
+anyConfOptions.o: anyConfOptions.cpp anyConfOptions.h
 	$(C++) $(CCFLAGS) $< -c
 
 authAlgo.o: authAlgo.cpp authAlgo.h buffer.h
diff --git a/src/anyctrOptions.cpp b/src/anyConfOptions.cpp
index c8f29e7..bde873a 100644
--- a/src/anyctrOptions.cpp
+++ b/src/anyConfOptions.cpp
@@ -34,7 +34,7 @@
 #include <sstream>
 
 #include "datatypes.h"
-#include "anyctrOptions.h"
+#include "anyConfOptions.h"
 
 Options* Options::inst = NULL;
 Mutex Options::instMutex;
diff --git a/src/anyctrOptions.h b/src/anyConfOptions.h
index 0e37242..bea749b 100644
--- a/src/anyctrOptions.h
+++ b/src/anyConfOptions.h
@@ -28,8 +28,8 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _ANYCTR_OPTIONS_H_
-#define _ANYCTR_OPTIONS_H_
+#ifndef _ANY_CONF_OPTIONS_H_
+#define _ANY_CONF_OPTIONS_H_
 
 #include "datatypes.h"
 #include "buffer.h"
diff --git a/src/anymuxOptions.cpp b/src/anyCtrOptions.cpp
index c892e26..4f03031 100644
--- a/src/anymuxOptions.cpp
+++ b/src/anyCtrOptions.cpp
@@ -34,7 +34,7 @@
 #include <sstream>
 
 #include "datatypes.h"
-#include "anymuxOptions.h"
+#include "anyCtrOptions.h"
 
 Options* Options::inst = NULL;
 Mutex Options::instMutex;
diff --git a/src/anymuxOptions.h b/src/anyCtrOptions.h
index dfbc213..933e9f2 100644
--- a/src/anymuxOptions.h
+++ b/src/anyCtrOptions.h
@@ -28,8 +28,8 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _ANYMUX_OPTIONS_H_
-#define _ANYMUX_OPTIONS_H_
+#ifndef _ANY_CTR_OPTIONS_H_
+#define _ANY_CTR_OPTIONS_H_
 
 #include "datatypes.h"
 #include "buffer.h"
diff --git a/src/muxSocket.cpp b/src/anyCtrSocket.cpp
index 0e0a43f..d3bec07 100644
--- a/src/muxSocket.cpp
+++ b/src/anyCtrSocket.cpp
@@ -3,10 +3,10 @@
 #include <fstream>
 #include <string>
 
-#include "anymuxOptions.h"
+#include "anyCtrOptions.h"
 
 #include "Sockets/Utility.h"
-#include "muxSocket.h"
+#include "anyCtrSocket.h"
 
 
 #ifdef SOCKETS_NAMESPACE
diff --git a/src/muxSocket.h b/src/anyCtrSocket.h
index e32c45d..e32c45d 100644
--- a/src/muxSocket.h
+++ b/src/anyCtrSocket.h
diff --git a/src/anytun-config.cpp b/src/anytun-config.cpp
index 733487a..de1dad1 100644
--- a/src/anytun-config.cpp
+++ b/src/anytun-config.cpp
@@ -38,7 +38,7 @@
 #include "keyDerivation.h"
 #include "keyDerivationFactory.h"
 #include "signalController.h"
-#include "anyctrOptions.h"
+#include "anyConfOptions.h"
 #include "connectionList.h"
 #include "routingTable.h"
 #include "networkAddress.h"
diff --git a/src/anytun-controld.cpp b/src/anytun-controld.cpp
index 204694e..1d12ab7 100644
--- a/src/anytun-controld.cpp
+++ b/src/anytun-controld.cpp
@@ -39,9 +39,9 @@
 
 #include "log.h"
 #include "signalController.h"
-#include "anymuxOptions.h"
+#include "anyCtrOptions.h"
 
-#include "muxSocket.h"
+#include "anyCtrSocket.h"
 #include "Sockets/ListenSocket.h"
 #include "Sockets/SocketHandler.h"