CTCE fixes for Issue #369

The 2 problems identified in Issue #369 for CTCE configurations are now corrected :
1. The "rport" parameter is now always taken into account when matching
    incoming CTCE connections, and no longer ignored when "rdevnum" is specified.
2. The "rdevnum" when specified as "=" was not incremented correctly when the
    "ldevnum.n" format was used to specify "n" multiple CTCE devices.

Author: Peter-J-Jansen

config.c

@@ -2127,7 +2127,7 @@ int parse_and_attach_devices(const char *sdevnum,
                    orig_newargv[j]=newargv[j]=resolve_symbol_string(addargv[j]);
                }
                /* Build the device configuration block */
-               rc=attach_device(dnd.lcss, devnum, sdevtype, addargc, newargv, numconfdev);
+               rc=attach_device(dnd.lcss, devnum, sdevtype, addargc, newargv, devnum - da[i].cuu1 + 1);
                for(j=0;j<addargc;j++)
                {
                    free(orig_newargv[j]);

ctcadpt.c

@@ -2041,6 +2041,7 @@ static int  CTCE_Init( DEVBLK *dev, int argc, char *argv[] )
                     CTCX_DEVNUM( dev ), dev->ctce_rccuu );
                 return -1;
             }
+            dev->ctce_rccuu += dev->numconfdev - 1;
         }
 
         // Remote CCUU addresses < 256 are not supported, but such values
@@ -2329,8 +2330,9 @@ static void*  CTCE_ListenThread( void* argp )
                             && dev->allocated
                             && dev->ctctype == CTC_CTCE
                             && dev->ctce_ipaddr.s_addr == parm_listen.addr.sin_addr.s_addr
+                            && dev->ctce_rport == pSokBuf->ctce_lport
                             &&  ( 0
-                                || ( ( dev->ctce_rccuu == 0 ) && ( dev->ctce_rport == pSokBuf->ctce_lport ) )
+                                ||   ( dev->ctce_rccuu == 0 )
                                 || ( ( dev->ctce_rccuu != 0 ) && ( dev->ctce_rccuu == pSokBuf->devnum     ) )
                                 )
                             )