Osmocom Open Build Service

Changes of Revision 1123

open5gs_2.7.6.4731.e3c3.202507202026.dsc Deleted

@@ -1,39 +0,0 @@
-Format: 3.0 (native)
-Source: open5gs
-Binary: open5gs-common, open5gs-mme, open5gs-sgwc, open5gs-smf, open5gs-amf, open5gs-sgwu, open5gs-upf, open5gs-hss, open5gs-pcrf, open5gs-nrf, open5gs-scp, open5gs-sepp, open5gs-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg
-Architecture: any
-Version: 2.7.6.4731.e3c3.202507202026
-Maintainer: Harald Welte <laforge@gnumonks.org>
-Uploaders: Sukchan Lee <acetcom@gmail.com>
-Homepage: https://open5gs.org
-Standards-Version: 4.3.0
-Vcs-Browser: https://github.com/open5gs/open5gs
-Vcs-Git: git://github.com/open5gs/open5gs
-Build-Depends: debhelper (>= 11), git, pkg-config, meson (>= 0.43.0), cmake, flex, bison, libgnutls28-dev, libgcrypt-dev, libssl-dev, libidn-dev | libidn11-dev, libmongoc-dev, libbson-dev, libsctp-dev, libyaml-dev, libmicrohttpd-dev, libcurl4-gnutls-dev, libnghttp2-dev, libtins-dev, libtalloc-dev
-Package-List:
- open5gs deb net optional arch=any
- open5gs-amf deb net optional arch=any
- open5gs-ausf deb net optional arch=any
- open5gs-bsf deb net optional arch=any
- open5gs-common deb net optional arch=any
- open5gs-dbg deb net optional arch=any
- open5gs-hss deb net optional arch=any
- open5gs-mme deb net optional arch=any
- open5gs-nrf deb net optional arch=any
- open5gs-nssf deb net optional arch=any
- open5gs-pcf deb net optional arch=any
- open5gs-pcrf deb net optional arch=any
- open5gs-scp deb net optional arch=any
- open5gs-sepp deb net optional arch=any
- open5gs-sgwc deb net optional arch=any
- open5gs-sgwu deb net optional arch=any
- open5gs-smf deb net optional arch=any
- open5gs-udm deb net optional arch=any
- open5gs-udr deb net optional arch=any
- open5gs-upf deb net optional arch=any
-Checksums-Sha1:
- 8bc5e973f81cd2bfb086c01b94f01e4d39a9187a 15022980 open5gs_2.7.6.4731.e3c3.202507202026.tar.xz
-Checksums-Sha256:
- 179cf317aebef5a352ba4a536087ab3bc12669e96c274eaf09c0f4137b5ef1e9 15022980 open5gs_2.7.6.4731.e3c3.202507202026.tar.xz
-Files:
- 99a01038eb43f2d4a220d7e2d7010fd3 15022980 open5gs_2.7.6.4731.e3c3.202507202026.tar.xz

open5gs_2.7.6.4735.60a9.202507212026.dsc Added

@@ -0,0 +1,39 @@
+Format: 3.0 (native)
+Source: open5gs
+Binary: open5gs-common, open5gs-mme, open5gs-sgwc, open5gs-smf, open5gs-amf, open5gs-sgwu, open5gs-upf, open5gs-hss, open5gs-pcrf, open5gs-nrf, open5gs-scp, open5gs-sepp, open5gs-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg
+Architecture: any
+Version: 2.7.6.4735.60a9.202507212026
+Maintainer: Harald Welte <laforge@gnumonks.org>
+Uploaders: Sukchan Lee <acetcom@gmail.com>
+Homepage: https://open5gs.org
+Standards-Version: 4.3.0
+Vcs-Browser: https://github.com/open5gs/open5gs
+Vcs-Git: git://github.com/open5gs/open5gs
+Build-Depends: debhelper (>= 11), git, pkg-config, meson (>= 0.43.0), cmake, flex, bison, libgnutls28-dev, libgcrypt-dev, libssl-dev, libidn-dev | libidn11-dev, libmongoc-dev, libbson-dev, libsctp-dev, libyaml-dev, libmicrohttpd-dev, libcurl4-gnutls-dev, libnghttp2-dev, libtins-dev, libtalloc-dev
+Package-List:
+ open5gs deb net optional arch=any
+ open5gs-amf deb net optional arch=any
+ open5gs-ausf deb net optional arch=any
+ open5gs-bsf deb net optional arch=any
+ open5gs-common deb net optional arch=any
+ open5gs-dbg deb net optional arch=any
+ open5gs-hss deb net optional arch=any
+ open5gs-mme deb net optional arch=any
+ open5gs-nrf deb net optional arch=any
+ open5gs-nssf deb net optional arch=any
+ open5gs-pcf deb net optional arch=any
+ open5gs-pcrf deb net optional arch=any
+ open5gs-scp deb net optional arch=any
+ open5gs-sepp deb net optional arch=any
+ open5gs-sgwc deb net optional arch=any
+ open5gs-sgwu deb net optional arch=any
+ open5gs-smf deb net optional arch=any
+ open5gs-udm deb net optional arch=any
+ open5gs-udr deb net optional arch=any
+ open5gs-upf deb net optional arch=any
+Checksums-Sha1:
+ 25e63230b1a7e80409db31c44dd9808f10343aa1 15027472 open5gs_2.7.6.4735.60a9.202507212026.tar.xz
+Checksums-Sha256:
+ 9c2fb853ac0647bf148223b787fd3c98db22f373a14464c1e8c677f713c92ce0 15027472 open5gs_2.7.6.4735.60a9.202507212026.tar.xz
+Files:
+ 1e062268c68e874ed497e35aea40df91 15027472 open5gs_2.7.6.4735.60a9.202507212026.tar.xz

open5gs_2.7.6.4731.e3c3.202507202026.tar.xz/.tarball-version -> open5gs_2.7.6.4735.60a9.202507212026.tar.xz/.tarball-version Changed

open5gs_2.7.6.4731.e3c3.202507202026.tar.xz/debian/changelog -> open5gs_2.7.6.4735.60a9.202507212026.tar.xz/debian/changelog Changed

open5gs_2.7.6.4731.e3c3.202507202026.tar.xz/lib/core/ogs-sockaddr.c -> open5gs_2.7.6.4735.60a9.202507212026.tar.xz/lib/core/ogs-sockaddr.c Changed

@@ -103,11 +103,18 @@
     int rc;
     char serviceNI_MAXSERV;
     struct addrinfo hints, *ai, *ai_list;
-    ogs_sockaddr_t *prev;
+    ogs_sockaddr_t *prev = NULL;
+
+    /* Last node of original list (for appending) */
+    ogs_sockaddr_t *tail = NULL;
+    /* First newly added node (for cleanup on error) */
+    ogs_sockaddr_t *first_new = NULL;
+
     char bufOGS_ADDRSTRLEN;
 
     ogs_assert(sa_list);
 
+    /* Prepare hints for getaddrinfo() */
     memset(&hints, 0, sizeof(hints));
     hints.ai_family = family;
     hints.ai_socktype = SOCK_STREAM;
@@ -118,24 +125,41 @@
     rc = getaddrinfo(hostname, service, &hints, &ai_list);
     if (rc != 0) {
         ogs_log_message(OGS_LOG_ERROR, ogs_socket_errno,
-                "getaddrinfo(%d:%s:%d:0x%x) failed",
-                family, hostname, port, flags);
+                        "getaddrinfo(%d:%s:%d:0x%x) failed: %s",
+                        family, hostname ? hostname : "(null)",
+                        port, flags, gai_strerror(rc));
+        /* Non-fatal: log the error and return */
         return OGS_ERROR;
     }
 
-    prev = NULL;
+    /* Find the end of the existing list, so new entries can be appended */
     if (*sa_list) {
-        prev = *sa_list;
-        while(prev->next) prev = prev->next;
+        tail = *sa_list;
+        while (tail->next)
+            tail = tail->next;
+        prev = tail;
     }
+
+    /* Iterate over each result from getaddrinfo and add to the linked list */
     for (ai = ai_list; ai; ai = ai->ai_next) {
         ogs_sockaddr_t *new, tmp;
         if (ai->ai_family != AF_INET && ai->ai_family != AF_INET6)
-            continue;
+            continue; /* Skip unsupported address families */
 
         new = ogs_calloc(1, sizeof(ogs_sockaddr_t));
         if (!new) {
             ogs_error("ogs_calloc() failed");
+            /* Clean up any partially added entries on memory failure */
+            if (first_new) {
+                if (tail) {
+                    /* detach new sub-list from original list */
+                    tail->next = NULL;
+                } else {
+                    *sa_list = NULL;    /* no original list, reset head */
+                }
+                ogs_freeaddrinfo(first_new);
+            }
+            freeaddrinfo(ai_list);
             return OGS_ERROR;
         }
         memcpy(&new->sa, ai->ai_addr, ai->ai_addrlen);
@@ -143,30 +167,49 @@
 
         if (hostname) {
             if (ogs_inet_pton(ai->ai_family, hostname, &tmp) == OGS_OK) {
-                /* It's a valid IP address */
+                /* Input string is a valid numeric IP address */
                 ogs_debug("addr:%s, port:%d", OGS_ADDR(new, buf), port);
             } else {
-                /* INVALID IP address! We assume it is a hostname */
+                /* Input string is not a numeric IP; treat it as a hostname */
                 new->hostname = ogs_strdup(hostname);
-                ogs_assert(new->hostname);
+                if (!new->hostname) {
+                    ogs_error("ogs_strdup() failed");
+                    /* Free the new node and any previously added nodes */
+                    ogs_free(new);
+                    if (first_new) {
+                        if (tail) {
+                            tail->next = NULL;
+                        } else {
+                            *sa_list = NULL;
+                        }
+                        ogs_freeaddrinfo(first_new);
+                    }
+                    freeaddrinfo(ai_list);
+                    return OGS_ERROR;
+                }
                 ogs_debug("name:%s, port:%d", new->hostname, port);
             }
         }
 
-        if (!prev)
+        /* Link the new node into the list */
+        if (!prev) {
             *sa_list = new;
-        else
+        } else {
             prev->next = new;
-
+        }
         prev = new;
+        if (!first_new) {
+            first_new = new;  /* mark the first new node added */
+        }
     }
 
     freeaddrinfo(ai_list);
 
-    if (prev == NULL) {
+    if (first_new == NULL) {
+        /* No addresses were added (e.g., no AF_INET/AF_INET6 results) */
         ogs_log_message(OGS_LOG_ERROR, ogs_socket_errno,
-                "ogs_getaddrinfo(%d:%s:%d:%d) failed",
-                family, hostname, port, flags);
+                        "ogs_addaddrinfo(%d:%s:%d:0x%x) returned no addresses",
+                        family, hostname ? hostname : "(null)", port, flags);
         return OGS_ERROR;
     }
 
@@ -800,3 +843,37 @@
     /* No address */
     return NULL;
 }
+
+int ogs_sockaddr_from_ip_or_fqdn(ogs_sockaddr_t **sa_list,
+        int family, const char *ip_or_fqdn, uint16_t port)
+{
+    int rc;
+    int flags = 0;
+    ogs_sockaddr_t tmp;
+
+    ogs_assert(sa_list);
+    ogs_assert(ip_or_fqdn);
+
+    /* Determine if the input is an IP literal (numeric address).
+     * If so, use AI_NUMERICHOST to avoid DNS lookup. */
+    if (ogs_inet_pton(AF_INET, ip_or_fqdn, &tmp) == OGS_OK ||
+        ogs_inet_pton(AF_INET6, ip_or_fqdn, &tmp) == OGS_OK) {
+        flags |= AI_NUMERICHOST;
+    }
+
+    /* Use ogs_addaddrinfo
+     * to perform resolution and construct the sockaddr list */
+    *sa_list = NULL;
+    rc = ogs_addaddrinfo(sa_list, family, ip_or_fqdn, port, flags);
+    if (rc != OGS_OK) {
+        ogs_error("Failed to resolve address: %s", ip_or_fqdn);
+        /* Cleanup: free any nodes that might have been added before failure */
+        if (*sa_list) {
+            ogs_freeaddrinfo(*sa_list);
+            *sa_list = NULL;
+        }
+        return OGS_ERROR;
+    }
+
+    return OGS_OK;
+}

open5gs_2.7.6.4731.e3c3.202507202026.tar.xz/lib/core/ogs-sockaddr.h -> open5gs_2.7.6.4735.60a9.202507212026.tar.xz/lib/core/ogs-sockaddr.h Changed

open5gs_2.7.6.4731.e3c3.202507202026.tar.xz/src/smf/context.c -> open5gs_2.7.6.4735.60a9.202507212026.tar.xz/src/smf/context.c Changed

@@ -111,6 +111,8 @@
 
 void smf_context_final(void)
 {
+    int i;
+
     ogs_gtp_node_t *gnode = NULL, *next_gnode = NULL;
     ogs_assert(context_initialized == 1);
 
@@ -143,6 +145,11 @@
         ogs_gtp_node_remove(&self.sgw_s5c_list, gnode);
     }
 
+    for (i = 0; i < self.num_of_p_cscf; i++)
+        ogs_free(self.p_cscfi);
+    for (i = 0; i < self.num_of_p_cscf6; i++)
+        ogs_free(self.p_cscf6i);
+
     ogs_pool_final(&smf_gtp_node_pool);
 
     context_initialized = 0;
@@ -547,40 +554,69 @@
                     ogs_yaml_iter_t p_cscf_iter;
                     ogs_yaml_iter_recurse(&smf_iter, &p_cscf_iter);
                     ogs_assert(ogs_yaml_iter_type(&p_cscf_iter) !=
-                        YAML_MAPPING_NODE);
+                            YAML_MAPPING_NODE);
 
                     self.num_of_p_cscf = 0;
                     self.num_of_p_cscf6 = 0;
                     do {
                         const char *v = NULL;
+                        ogs_sockaddr_t *resolved_list = NULL;
+                        ogs_sockaddr_t *cur = NULL;
+                        char bufOGS_ADDRSTRLEN;
+                        int res;
 
                         if (ogs_yaml_iter_type(&p_cscf_iter) ==
                                 YAML_SEQUENCE_NODE) {
                             if (!ogs_yaml_iter_next(&p_cscf_iter))
                                 break;
                         }
-
                         v = ogs_yaml_iter_value(&p_cscf_iter);
-                        if (v) {
-                            ogs_ipsubnet_t ipsub;
-                            rv = ogs_ipsubnet(&ipsub, v, NULL);
-                            ogs_assert(rv == OGS_OK);
+                        if (!v) {
+                            ogs_error("No value for P-CSCF in configuration");
+                            continue;
+                        }
 
-                            if (ipsub.family == AF_INET) {
-                                if (self.num_of_p_cscf >= MAX_NUM_OF_P_CSCF)
-                                    ogs_warn("Ignore P-CSCF : %s", v);
-                                else self.p_cscfself.num_of_p_cscf++ = v;
+                        /* Use the new API to resolve IP or FQDN
+                         * into one or more addresses */
+                        res = ogs_sockaddr_from_ip_or_fqdn(
+                                &resolved_list, AF_UNSPEC, v, 0);
+                        if (res != OGS_OK || !resolved_list) {
+                            ogs_error("Failed to resolve P-CSCF address: %s",
+                                    v);
+                            continue; /* Skip this entry and move to the next */
+                        }
+
+                        /* Iterate through all resolved addresses
+                         * and store them */
+                        for (cur = resolved_list; cur; cur = cur->next) {
+                            if (cur->ogs_sa_family == AF_INET) {
+                                if (self.num_of_p_cscf < MAX_NUM_OF_P_CSCF) {
+                                    self.p_cscfself.num_of_p_cscf++ =
+                                        ogs_ipstrdup(cur);
+                                } else {
+                                    ogs_warn("Ignore P-CSCF IPv4 "
+                                            "(max %d reached): %s",
+                                             MAX_NUM_OF_P_CSCF,
+                                             OGS_ADDR(cur, buf));
+                                }
+                            } else if (cur->ogs_sa_family == AF_INET6) {
+                                if (self.num_of_p_cscf6 < MAX_NUM_OF_P_CSCF) {
+                                    self.p_cscf6self.num_of_p_cscf6++ =
+                                        ogs_ipstrdup(cur);
+                                } else {
+                                    ogs_warn("Ignore P-CSCF IPv6 "
+                                            "(max %d reached): %s",
+                                             MAX_NUM_OF_P_CSCF,
+                                             OGS_ADDR(cur, buf));
+                                }
                             }
-                            else if (ipsub.family == AF_INET6) {
-                                if (self.num_of_p_cscf6 >= MAX_NUM_OF_P_CSCF)
-                                    ogs_warn("Ignore P-CSCF : %s", v);
-                                else self.p_cscf6self.num_of_p_cscf6++ = v;
-                            } else
-                                ogs_warn("Ignore P-CSCF : %s", v);
                         }
+                        /* free the linked list */
+                        ogs_freeaddrinfo(resolved_list);
 
                     } while (ogs_yaml_iter_type(&p_cscf_iter) ==
-                                YAML_SEQUENCE_NODE);
+                            YAML_SEQUENCE_NODE);
+
                 } else if (!strcmp(smf_key, "info")) {
                     ogs_sbi_nf_instance_t *nf_instance = NULL;

open5gs_2.7.6.4731.e3c3.202507202026.tar.xz/src/smf/context.h -> open5gs_2.7.6.4735.60a9.202507212026.tar.xz/src/smf/context.h Changed