From b075f6c03fcd5c5e7ecc7ac10dc0023a81bfa8a1 Mon Sep 17 00:00:00 2001
From: Stefan Sayer <stefan.sayer@googlemail.com>
Date: Wed, 2 Jan 2008 17:50:01 +0000
Subject: [PATCH] fixed some -DOpenSER compilation issues

git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@573 8eb893ce-cfd4-0310-b710-fb5ebe64c474
---
 .../unixsockctrl/UnixSocketAdapter.cpp        | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/core/plug-in/unixsockctrl/UnixSocketAdapter.cpp b/core/plug-in/unixsockctrl/UnixSocketAdapter.cpp
index 4ee1df27..4512dad5 100644
--- a/core/plug-in/unixsockctrl/UnixSocketAdapter.cpp
+++ b/core/plug-in/unixsockctrl/UnixSocketAdapter.cpp
@@ -293,13 +293,15 @@ bool UnixSocketAdapter::receive(AmSipReply &reply)
   string tmp_str;
   string cseq_str;
 
-  if (cacheMsg() < 0)
-    goto failure;
-
 #ifdef OpenSER
   unsigned int mi_res_code;
   string mi_res_msg;
+#endif
 
+  if (cacheMsg() < 0)
+    goto failure;
+
+#ifdef OpenSER
   SAFECTRLCALL1(getParam,tmp_str);
     
   DBG("MI response from OpenSER: %s\n",tmp_str.c_str());
@@ -434,9 +436,9 @@ string UnixSocketAdapter::serialize(const AmSipReply &reply,
 {
   string msg;
 
-  msg = ":t_reply:" +
+  msg = ":t_reply:" 
 #ifndef OpenSER
-    rplAddr +
+    + rplAddr +
 #endif
     "\n";
 
@@ -563,9 +565,9 @@ string UnixSocketAdapter::serialize(const AmSipRequest& req,
 {
   string msg;
 
-  msg = ":t_uac_dlg:" + 
+  msg = ":t_uac_dlg:" 
 #ifndef OpenSER
-    rplAddr + 
+    + rplAddr + 
 #endif
     "\n"
     + req.method + "\n"
@@ -623,7 +625,7 @@ string UnixSocketAdapter::serialize(const AmSipRequest& req,
     + req.body + ".\n\n";
 #else
   // is lf2crlf() needed?! (see function for replies)
-  bodyFrame = "\n" + "\"" + lf2crlf(body) + "\"";
+  bodyFrame = "\n"  "\"" + lf2crlf(req.body) + "\"";
 #endif
 
   msg += extraHdrs + bodyFrame;
@@ -636,15 +638,15 @@ string UnixSocketAdapter::serialize_cancel(const AmSipRequest& req,
 {
   string msg;
 
-  msg = ":t_uac_cancel:" + 
+  msg = ":t_uac_cancel:" 
 #ifndef OpenSER
-    rplAddr + 
+    + rplAddr + 
 #endif
     "\n" +
     req.callid + "\n" +
     int2str(req.cseq) + "\n"
 #ifndef OpenSER
-    + "\n"
+    "\n"
 #endif
     ;
   return msg;