From 1b3f0368862402a037613fdd11d9ab8788090e3c Mon Sep 17 00:00:00 2001
From: rjongbloed <rjongbloed>
Date: Thu, 26 Jul 2007 01:05:44 +0000
Subject: [PATCH] Code tidy up.

---
 src/sip/sipcon.cxx | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/sip/sipcon.cxx b/src/sip/sipcon.cxx
index eee6e373..6bee0378 100644
--- a/src/sip/sipcon.cxx
+++ b/src/sip/sipcon.cxx
@@ -24,6 +24,9 @@
  * Contributor(s): ______________________________________.
  *
  * $Log$
+ * Revision 2.251  2007/07/26 01:05:44  rjongbloed
+ * Code tidy up.
+ *
  * Revision 2.250  2007/07/25 03:42:55  csoutheren
  * Fix extraction of remote signal address from Contact field
  *
@@ -2249,12 +2252,11 @@ void SIPConnection::OnReceivedINVITE(SIP_PDU & request)
   BOOL isReinvite;
 
   const SIPMIMEInfo & requestMIME = request.GetMIME();
-  if (IsOriginating()) {
-    PString to = requestMIME.GetTo();
-    PString from = requestMIME.GetFrom();
+  PString requestTo = requestMIME.GetTo();
+  PString requestFrom = requestMIME.GetFrom();
 
-    if (remotePartyAddress != requestMIME.GetFrom() ||
-        localPartyAddress  != requestMIME.GetTo()) {
+  if (IsOriginating()) {
+    if (remotePartyAddress != requestFrom || localPartyAddress != requestTo) {
       PTRACE(2, "SIP\tIgnoring INVITE from " << request.GetURI() << " when originated call.");
       SIP_PDU response(request, SIP_PDU::Failure_LoopDetected);
       SendPDU(response, request.GetViaAddress(endpoint));
@@ -2278,8 +2280,7 @@ void SIPConnection::OnReceivedINVITE(SIP_PDU & request)
       return;
     }
 
-    if (originalMIME.GetTo()   != requestMIME.GetTo() ||
-        originalMIME.GetFrom() != requestMIME.GetFrom()) {
+    if (originalMIME.GetTo() != requestTo || originalMIME.GetFrom() != requestFrom) {
       // Different "dialog" determined by the tags in the to and from fields indicate forking
       PTRACE(3, "SIP\tIgnoring forked INVITE from " << request.GetURI());
       SIP_PDU response(request, SIP_PDU::Failure_LoopDetected);
-- 
2.11.4.GIT