Correct node matching when adding new node.

xrootd · Jan 10, 2014 · 96324da · 96324da
1 parent b6e2c43
commit 96324da
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/XrdCms/XrdCmsCluster.cc b/src/XrdCms/XrdCmsCluster.cc
@@ -140,7 +140,7 @@ XrdCmsNode *XrdCmsCluster::Add(XrdLink *lp, int port, int Status,
 //
    for (Slot = 0; Slot < STMax; Slot++)
        if (NodeTab[Slot])
-          {if (NodeTab[Slot]->isNode(lp, theNID)) break;
+          {if (NodeTab[Slot]->isNode(lp, theNID, port)) break;
 /*Conn*/   if (NodeTab[Slot]->isConn)
               {if (!NodeTab[Slot]->isPerm && Special)
                                              Bump2 = Slot; // Last conn Server

diff --git a/src/XrdCms/XrdCmsNode.hh b/src/XrdCms/XrdCmsNode.hh
@@ -125,8 +125,8 @@ inline int    isNode(const char *hn)
                     {return Link && !strcmp(Link->Host(), hn);}
 inline int    isNode(const XrdNetAddr *addr)
                     {return netID.Same(addr);}
-inline int    isNode(XrdLink *lp, const char *nid)
-                    {return netID.Same(lp->NetAddr(),true)
+inline int    isNode(XrdLink *lp, const char *nid, int port)
+                    {return netID.Same(lp->NetAddr()) && port == Port
                          && (nid ? !strcmp(myNID, nid) : 1);
                     }
 inline char  *Name()   {return (myName ? myName : (char *)"?");}