From 8a1245d433b03900f48167abc5055aa3a0eca637 Mon Sep 17 00:00:00 2001
From: Chiradeep Vittal <chiradeep@cloud.com>
Date: Fri, 29 Oct 2010 16:34:28 -0700
Subject: [PATCH] bug 6807: first ip is different from sourcenat status 6807:
 resolved fixed

---
 .../hypervisor/xen/resource/CitrixResourceBase.java      | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index e17dbc4729e..04d19bdef35 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -1325,13 +1325,16 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR
             } else {
                 args = "-D";
             }
+            String cidrSize = Long.toString(NetUtils.getCidrSize(vlanNetmask));
             if (sourceNat) {
                 args += " -f";
-                long cidrSize = NetUtils.getCidrSize(vlanNetmask);
                 args += " -l ";
-                args += publicIpAddress + "/" + Long.toString(cidrSize);
-            } else {
+                args += publicIpAddress + "/" + cidrSize;
+            } else if (firstIP) {
             	args += " -l ";
+                args += publicIpAddress + "/" + cidrSize;
+            } else {
+              	args += " -l ";
                 args += publicIpAddress;
             }
             args += " -i ";