OrkAudio now reports local and remote IP addresses for each tape when the voip plugin is used.

git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@217 09dcff7a-b715-0410-9601-b79a96267cd0

2 files changed, 33 insertions, 1 deletions

diff --git a/orkbasecxx/AudioCapture.cpp b/orkbasecxx/AudioCapture.cpp
index e1c64c3..5523757 100644
--- a/orkbasecxx/AudioCapture.cpp
+++ b/orkbasecxx/AudioCapture.cpp
@@ -225,6 +225,14 @@ CStdString CaptureEvent::EventTypeToString(int eventTypeEnum)
 		return ET_LOCALENTRYPOINT;
 	case	EtKeyValue:
 		return ET_KEYVALUE;
+	case	EtLocalIp:
+		return ET_LOCALIP;
+	case	EtRemoteIp:
+		return ET_REMOTEIP;
+	case	EtLocalMac:
+		return ET_LOCALMAC;
+	case	EtRemoteMac:
+		return ET_REMOTEMAC;
 	}
 	return ET_INVALID;
 }
@@ -260,6 +268,22 @@ int CaptureEvent::EventTypeToEnum(CStdString& eventTypeString)
 	{
 		eventTypeEnum = EtKeyValue;
 	}
+	else if (eventTypeString.CompareNoCase(ET_LOCALIP) == 0)
+	{
+		eventTypeEnum = EtLocalIp;
+	}
+	else if (eventTypeString.CompareNoCase(ET_REMOTEIP) == 0)
+	{
+		eventTypeEnum = EtRemoteIp;
+	}
+	else if (eventTypeString.CompareNoCase(ET_LOCALMAC) == 0)
+	{
+		eventTypeEnum = EtLocalMac;
+	}
+	else if (eventTypeString.CompareNoCase(ET_REMOTEMAC) == 0)
+	{
+		eventTypeEnum = EtRemoteMac;
+	}
 	return eventTypeEnum;
 }
 
diff --git a/orkbasecxx/AudioCapture.h b/orkbasecxx/AudioCapture.h
index 19bb184..9a9c6b4 100644
--- a/orkbasecxx/AudioCapture.h
+++ b/orkbasecxx/AudioCapture.h
@@ -112,6 +112,10 @@ public:
 #define ET_LOCALPARTY "localparty"
 #define ET_LOCALENTRYPOINT "localentrypoint"
 #define ET_KEYVALUE "keyvalue"
+#define ET_LOCALIP "localip"
+#define ET_REMOTEIP "remoteip"
+#define ET_LOCALMAC "localmac"
+#define ET_REMOTEMAC "remotemac"
 #define ET_INVALID "invalid"
 	typedef enum
 	{
@@ -123,7 +127,11 @@ public:
 		EtLocalParty = 5,
 		EtLocalEntryPoint = 6,
 		EtKeyValue = 7,
-		EtInvalid = 8
+		EtLocalIp = 8,
+		EtRemoteIp = 9,
+		EtLocalMac = 10,
+		EtRemoteMac = 11,
+		EtInvalid = 12
 	} EventTypeEnum;
 	static CStdString EventTypeToString(int eventTypeEnum);
 	static int EventTypeToEnum(CStdString&);