int32_t cleanup: SctpSocket: port, fs, assId

Author: avarga

src/inet/transportlayer/contract/sctp/SctpSocket.cc

@@ -206,7 +206,7 @@ void SctpSocket::listen(bool fork, bool reset, uint32_t requests, uint32_t messa
     sockstate = LISTENING;
 }
 
-void SctpSocket::listen(uint32_t requests, bool fork, uint32_t messagesToPush, bool options, int32_t fd)
+void SctpSocket::listen(uint32_t requests, bool fork, uint32_t messagesToPush, bool options, int fd)
 {
     if (sockstate != CLOSED)
         throw cRuntimeError(sockstate == NOT_BOUND ?
@@ -236,7 +236,7 @@ void SctpSocket::listen(uint32_t requests, bool fork, uint32_t messagesToPush, b
     sockstate = LISTENING;
 }
 
-void SctpSocket::connect(L3Address remoteAddress, int32_t remotePort, bool streamReset, int32_t prMethod, uint32_t numRequests)
+void SctpSocket::connect(L3Address remoteAddress, int remotePort, bool streamReset, int prMethod, uint32_t numRequests)
 {
     EV_INFO << "Socket connect. Assoc=" << assocId << ", sockstate=" << stateName(sockstate) << "\n";
 
@@ -279,7 +279,7 @@ void SctpSocket::connect(L3Address remoteAddress, int32_t remotePort, bool strea
         sockstate = CONNECTING;
 }
 
-void SctpSocket::connect(int32_t fd, L3Address remoteAddress, int32_t remotePort, uint32_t numRequests, bool options)
+void SctpSocket::connect(int fd, L3Address remoteAddress, int remotePort, uint32_t numRequests, bool options)
 {
     EV_INFO << "Socket connect. Assoc=" << assocId << ", sockstate=" << stateName(sockstate) << "\n";
 
@@ -322,7 +322,7 @@ void SctpSocket::connect(int32_t fd, L3Address remoteAddress, int32_t remotePort
         sockstate = CONNECTING;
 }
 
-void SctpSocket::accept(int32_t assId, int32_t fd)
+void SctpSocket::accept(int assId, int fd)
 {
     Request *cmsg = new Request("Accept", SCTP_C_ACCEPT);
     auto cmd = cmsg->addTag<SctpCommandReq>();
@@ -343,7 +343,7 @@ void SctpSocket::acceptSocket(int newSockId)
     check_and_cast<cSimpleModule *>(gateToSctp->getOwnerModule())->send(cmsg, gateToSctp);
 }
 
-void SctpSocket::connectx(AddressVector remoteAddressList, int32_t remotePort, bool streamReset, int32_t prMethod, uint32_t numRequests)
+void SctpSocket::connectx(AddressVector remoteAddressList, int remotePort, bool streamReset, int prMethod, uint32_t numRequests)
 {
     EV_INFO << "Socket connectx.  sockstate=" << stateName(sockstate) << "\n";
     remoteAddresses = remoteAddressList;

src/inet/transportlayer/contract/sctp/SctpSocket.h

@@ -243,25 +243,25 @@ class INET_API SctpSocket : public ISocket
      */
     void listen(bool fork = true, bool streamReset = false, uint32_t requests = 0, uint32_t messagesToPush = 0);
 
-    void listen(uint32_t requests = 0, bool fork = false, uint32_t messagesToPush = 0, bool options = false, int32_t fd = -1);
+    void listen(uint32_t requests = 0, bool fork = false, uint32_t messagesToPush = 0, bool options = false, int fd = -1);
 
     void accept(int socketId);
 
     /**
      * Active OPEN to the given remote socket.
      */
-    void connect(L3Address remoteAddress, int32_t remotePort, bool streamReset = false, int32_t prMethod = 0, uint32_t numRequests = 0);
+    void connect(L3Address remoteAddress, int remotePort, bool streamReset = false, int prMethod = 0, uint32_t numRequests = 0);
 
-    void connect(int32_t fd, L3Address remoteAddress, int32_t remotePort, uint32_t numRequests, bool options = false);
+    void connect(int fd, L3Address remoteAddress, int remotePort, uint32_t numRequests, bool options = false);
 
     /**
      * Active OPEN to the given remote socket.
      * The current implementation just calls connect() with the first address
      * of the given list. This behaviour may be improved in the future.
      */
-    void connectx(AddressVector remoteAddresses, int32_t remotePort, bool streamReset = false, int32_t prMethod = 0, uint32_t numRequests = 0);
+    void connectx(AddressVector remoteAddresses, int remotePort, bool streamReset = false, int prMethod = 0, uint32_t numRequests = 0);
 
-    void accept(int32_t assocId, int32_t fd);
+    void accept(int assocId, int fd);
 
     void acceptSocket(int newSockId);