Changeset 1543:9222d31123b1 in freeDiameter for libfdcore

Timestamp:

May 25, 2020, 5:32:57 PM (4 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Phase:

public

Message:

Use more portable sctp_opt_info() instead of getsockopt() for SCTP.

From Robert Swindells.

File:

• libfdcore/sctp.c (modified) (6 diffs)

libfdcore/sctp.c

@@ -83 +83 @@
                         sz = sizeof(rtoinfo);
                         /* Read socket defaults */
-                        CHECK_SYS(  getsockopt(sk, IPPROTO_SCTP, SCTP_RTOINFO, &rtoinfo, &sz)  );
+                        CHECK_SYS(  sctp_opt_info(sk, 0, SCTP_RTOINFO, &rtoinfo, &sz)  );
                         if (sz != sizeof(rtoinfo))
                         {
@@ -103 +103 @@
                 if (TRACE_BOOL(ANNOYING)) {
                         /* Check new values */
-                        CHECK_SYS(  getsockopt(sk, IPPROTO_SCTP, SCTP_RTOINFO, &rtoinfo, &sz)  );
+                        CHECK_SYS(  sctp_opt_info(sk, 0, SCTP_RTOINFO, &rtoinfo, &sz)  );
                         fd_log_debug( "New SCTP_RTOINFO : srto_initial : %u", rtoinfo.srto_initial);
                         fd_log_debug( "                   srto_max     : %u", rtoinfo.srto_max);
@@ -122 +122 @@
                         sz = sizeof(assoc);
                         /* Read socket defaults */
-                        CHECK_SYS(  getsockopt(sk, IPPROTO_SCTP, SCTP_ASSOCINFO, &assoc, &sz)  );
+                        CHECK_SYS(  sctp_opt_info(sk, 0, SCTP_ASSOCINFO, &assoc, &sz)  );
                         if (sz != sizeof(assoc))
                         {
@@ -143 +143 @@
                 if (TRACE_BOOL(ANNOYING)) {
                         /* Check new values */
-                        CHECK_SYS(  getsockopt(sk, IPPROTO_SCTP, SCTP_ASSOCINFO, &assoc, &sz)  );
+                        CHECK_SYS(  sctp_opt_info(sk, 0, SCTP_ASSOCINFO, &assoc, &sz)  );
                         fd_log_debug( "New SCTP_ASSOCINFO : sasoc_asocmaxrxt               : %hu", assoc.sasoc_asocmaxrxt);
                         fd_log_debug( "                     sasoc_number_peer_destinations : %hu", assoc.sasoc_number_peer_destinations);
@@ -319 +319 @@
 
                         /* Read socket defaults */
-                        CHECK_SYS(  getsockopt(sk, IPPROTO_SCTP, SCTP_PEER_ADDR_PARAMS, &parms, &sz)  );
+                        CHECK_SYS(  sctp_opt_info(sk, 0, SCTP_PEER_ADDR_PARAMS, &parms, &sz)  );
                         if (sz != sizeof(parms))
                         {
@@ -348 +348 @@
                 if (TRACE_BOOL(ANNOYING)) {
                         /* Check new values */
-                        CHECK_SYS(  getsockopt(sk, IPPROTO_SCTP, SCTP_PEER_ADDR_PARAMS, &parms, &sz)  );
+                        CHECK_SYS(  sctp_opt_info(sk, 0, SCTP_PEER_ADDR_PARAMS, &parms, &sz)  );
                         fd_log_debug( "New SCTP_PEER_ADDR_PARAMS : spp_hbinterval    : %u",  parms.spp_hbinterval);
                         fd_log_debug( "                            spp_pathmaxrxt    : %hu", parms.spp_pathmaxrxt);