debug

Author: wu-cl

.github/workflows/build-and-test.yml

@@ -575,12 +575,7 @@ jobs:
       run:  ./.ci/osx-prepare.sh
     - name: build
       run:  ./.ci/osx-build.sh
-    - name: upload logs on failure
-      if: failure()
-      uses: actions/upload-artifact@v4
-      with:
-        name: logs-osx-clang---disable-ssl
-        path: config.log
+
 
   build-linux-deb:
     env:
@@ -622,11 +617,7 @@ jobs:
     - name: build
       run:  ./.ci/linux-build.sh
 
-    - name: upload deb packages
-      uses: actions/upload-artifact@v4
-      with:
-        name: deb-packages-${{ matrix.dpdk }}-dpdk
-        path: '/home/runner/work/ovs/*.deb'
+
 
   build-linux-rpm:
     name: linux rpm fedora
@@ -657,10 +648,4 @@ jobs:
     - name: install
       run:  dnf install -y rpm/rpmbuild/RPMS/*/*.rpm
 
-    - name: upload rpm packages
-      uses: actions/upload-artifact@v4
-      with:
-        name: rpm-packages
-        path: |
-          rpm/rpmbuild/SRPMS/*.rpm
-          rpm/rpmbuild/RPMS/*/*.rpm
+

lib/lldp/lldpd-structs.c

@@ -119,22 +119,25 @@ lldpd_dot13_lists_cleanup(struct lldpd_port *port)
     struct lldpd_ppvid *ppvid;
     struct lldpd_vlan *vlan;
     struct lldpd_pi *pid;
-    if (port->p_vlans.next && !ovs_list_is_empty(&port->p_vlans)) {
+    //if (port->p_vlans.next && !ovs_list_is_empty(&port->p_vlans)) {
+    if (!ovs_list_is_empty(&port->p_vlans)) {
         LIST_FOR_EACH_SAFE (vlan, v_entries, &port->p_vlans) {
             ovs_list_remove(&vlan->v_entries);
             free(vlan->v_name);
             free(vlan);
         }
         ovs_list_init(&port->p_vlans);
     }
-    if (port->p_ppvids.next && !ovs_list_is_empty(&port->p_ppvids)) {
+    //if (port->p_ppvids.next && !ovs_list_is_empty(&port->p_ppvids)) {
+    if (!ovs_list_is_empty(&port->p_ppvids)) {
         LIST_FOR_EACH_SAFE (ppvid, p_entries, &port->p_ppvids) {
             ovs_list_remove(&ppvid->p_entries);
             free(ppvid);
         }
         ovs_list_init(&port->p_ppvids);
     }
-    if (port->p_pids.next && !ovs_list_is_empty(&port->p_pids)) {
+    //if (port->p_pids.next && !ovs_list_is_empty(&port->p_pids)) {
+    if (!ovs_list_is_empty(&port->p_pids)) {
         LIST_FOR_EACH_SAFE (pid, p_entries, &port->p_pids) {
             ovs_list_remove(&pid->p_entries);
             free(pid->p_pi);

lib/ovs-lldp.c

@@ -629,9 +629,9 @@ lldp_print_neighbor(struct ds *ds, struct lldp *lldp) OVS_REQUIRES(mutex)
     }
 
     LIST_FOR_EACH (hw, h_entries, &lldp->lldpd->g_hardware) {
-        if (!hw->h_rports.next) {
-            continue;
-        }
+        //if (!hw->h_rports.next) {
+        //    continue;
+        //}
 
         LIST_FOR_EACH (port, p_entries, &hw->h_rports) {
             if (!port->p_chassis) {
@@ -758,9 +758,9 @@ lldp_print_neighbor_json(struct json *interface_json, struct lldp *lldp)
     bool has_multi_interfaces = false;
 
     LIST_FOR_EACH (hw, h_entries, &lldp->lldpd->g_hardware) {
-        if (!hw->h_rports.next) {
-            continue;
-        }
+        // if (!hw->h_rports.next) {
+        //    continue;
+        //}
         LIST_FOR_EACH (port, p_entries, &hw->h_rports) {
             struct json *chassis_mgmt_iface_json = json_array_create_empty();
             struct json *chassis_capability_json = json_array_create_empty();

tests/ovs-lldp.at

@@ -9,10 +9,10 @@ AT_CHECK([
     ovs-vsctl set Interface p1 type=dummy lldp:enable=true
 ], [0])
 
-AT_CHECK([ovs-appctl netdev-dummy/receive p1 \
+AT_CHECK([sleep 10 && ovs-appctl netdev-dummy/receive p1 \
 '0180c200000e38a91c18a12688cc020704aaaaaaaaaaaa0416054769676162697445746865726e6574312f302f313506020079081f4769676162697445746865726e6574312f302f313520496e746572666163650a0e46616b6553797374656d4e616d650c0e46616b6553797374656d446573630e0403140114100c0501c0a80001020000027b00fe060080c2010001fe070080c202020000fe100080c203000109564c414e2030303031fe060080c2060000fe090080c2070100000000fe0900120f01036c01001efe0c00120f0203010113000000fffe0600120f042800fe0900120f0301000000000000'])
 
-AT_CHECK([ovs-appctl lldp/neighbor p1], [0], [dnl
+AT_CHECK([sleep 10 && ovs-appctl lldp/neighbor p1], [0], [dnl
 LLDP neighbor:
 Interface: p1
   Chassis ID:         aa:aa:aa:aa:aa:aa