sctp: SctpAssociation: timers: remove unnecessary renames, set the name only once

Author: ZoltanBojthe

src/inet/transportlayer/sctp/SctpAssociationBase.cc

@@ -602,13 +602,13 @@ void SctpAssociation::initAssociation(Sctp *_module, int32_t _appGateIndex, int3
 
     // ====== Timers =========================================================
     char timerName[128];
-    snprintf(timerName, sizeof(timerName), "T1_INIT of Association %d", assocId);
+    snprintf(timerName, sizeof(timerName), "T1_INIT of assoc %d", assocId);
     T1_InitTimer = new cMessage(timerName);
-    snprintf(timerName, sizeof(timerName), "T2_SHUTDOWN of Association %d", assocId);
+    snprintf(timerName, sizeof(timerName), "T2_SHUTDOWN of assoc %d", assocId);
     T2_ShutdownTimer = new cMessage(timerName);
-    snprintf(timerName, sizeof(timerName), "T5_SHUTDOWN_GUARD of Association %d", assocId);
+    snprintf(timerName, sizeof(timerName), "T5_SHUTDOWN_GUARD of assoc %d", assocId);
     T5_ShutdownGuardTimer = new cMessage(timerName);
-    snprintf(timerName, sizeof(timerName), "SACK_TIMER of Association %d", assocId);
+    snprintf(timerName, sizeof(timerName), "SACK_TIMER of assoc %d", assocId);
     SackTimer = new cMessage(timerName);
 
     StartTesting = nullptr;

src/inet/transportlayer/sctp/SctpAssociationRcvMessage.cc

@@ -547,16 +547,6 @@ bool SctpAssociation::processInitArrived(SctpInitChunk *initchunk, int32_t srcPo
             EV_INFO << "Connection forked: working connection got new assocId=" << workingAssoc->assocId << ", "
                     << "listener keeps LISTENing with assocId=" << this->assocId << "\n";
 
-            // Update timer names on the working connection
-            snprintf(timerName, sizeof(timerName), "T2_SHUTDOWN of assoc %d", workingAssoc->assocId);
-            workingAssoc->T2_ShutdownTimer->setName(timerName);
-            snprintf(timerName, sizeof(timerName), "T5_SHUTDOWN_GUARD of assoc %d", workingAssoc->assocId);
-            workingAssoc->T5_ShutdownGuardTimer->setName(timerName);
-            snprintf(timerName, sizeof(timerName), "SACK_TIMER of assoc %d", workingAssoc->assocId);
-            workingAssoc->SackTimer->setName(timerName);
-            snprintf(timerName, sizeof(timerName), "T1_INIT of assoc %d", workingAssoc->assocId);
-            workingAssoc->T1_InitTimer->setName(timerName);
-
             // The working connection continues processing recursively
             // It will execute the INIT processing (lines 570-691) and send INIT-ACK
             trans = workingAssoc->processInitChunk(initchunk);