Corrected InitiatorAddress in ConnectionSetupResponse, which was inco…

…rrectly assigned before
sfc-aqua · Oct 28, 2024 · 8ff611b · 8ff611b
1 parent 4891199
commit 8ff611b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/quisp/messages/connection_setup_messages.msg b/quisp/messages/connection_setup_messages.msg
@@ -30,6 +30,8 @@ packet ConnectionSetupResponse extends Header
     int application_id @getter(getApplicationId) @setter(setApplicationId);
     int actual_srcAddr;
     int actual_destAddr;
+    int initiator_addr @setter(setInitiatorAddr) @getter(getInitiatorAddr);
+    int responder_addr @setter(setResponderAddr) @getter(getResponderAddr);
     unsigned long connection_setup_request_id @setter(setConnectionSetupRequestId) @getter(getConnectionSetupRequestId);
     unsigned long RuleSet_id;
     json ruleSet;

diff --git a/quisp/modules/QRSA/ConnectionManager/ConnectionManager.cc b/quisp/modules/QRSA/ConnectionManager/ConnectionManager.cc
@@ -100,8 +100,8 @@ void ConnectionManager::handleMessage(cMessage *msg) {
   if (auto *resp = dynamic_cast<ConnectionSetupResponse *>(msg)) {
     reservation_register.updateReservationId(resp->getConnectionSetupRequestId(), resp->getRuleSet_id());
 
-    int initiator_addr = resp->getActual_destAddr();
-    int responder_addr = resp->getActual_srcAddr();
+    int initiator_addr = resp->getInitiatorAddr();
+    int responder_addr = resp->getResponderAddr();
 
     if (initiator_addr == my_address || responder_addr == my_address) {
       // this node is not a swapper
@@ -279,6 +279,8 @@ void ConnectionManager::respondToRequest(ConnectionSetupRequest *req) {
     resp->setDestAddr(owner_address);
     resp->setActual_srcAddr(my_address);
     resp->setActual_destAddr(owner_address);
+    resp->setInitiatorAddr(req->getActual_srcAddr());
+    resp->setResponderAddr(my_address);
     resp->setApplication_type(0);
     resp->setKind(2);
     send(resp, "RouterPort$o");