Merge branch 'main' into gh-pages

multipath-tcp · May 13, 2024 · 7a77d6d · 7a77d6d
2 parents c884da0 + 5eea3f4
commit 7a77d6d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
@@ -2,9 +2,9 @@ name: C/C++ CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build:

diff --git a/.github/workflows/ell-master.yml b/.github/workflows/ell-master.yml
@@ -2,9 +2,9 @@ name: ELL master
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build:

diff --git a/.github/workflows/multipath-tcp.org.yml b/.github/workflows/multipath-tcp.org.yml
@@ -2,9 +2,9 @@ name: multipath-tcp.org kernel
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build:

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
      Copyright (c) 2017-2021, Intel Corporation -->
 
 [![C/C++ CI](https://github.com/multipath-tcp/mptcpd/actions/workflows/ccpp.yml/badge.svg)](https://github.com/multipath-tcp/mptcpd/actions/workflows/ccpp.yml)
-[![Coverage Status](https://coveralls.io/repos/github/multipath-tcp/mptcpd/badge.svg?branch=master)](https://coveralls.io/github/multipath-tcp/mptcpd?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/multipath-tcp/mptcpd/badge.svg?branch=main)](https://coveralls.io/github/multipath-tcp/mptcpd?branch=main)
 [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.0-4baaaa.svg)](CODE_OF_CONDUCT.md)
 
 # Multipath TCP Daemon

diff --git a/tests/mptcpwrap-tester.c b/tests/mptcpwrap-tester.c
@@ -64,7 +64,7 @@ static void test_socket_data(struct socket_data const *data)
                                 "WARNING: Ignoring unsupported "
                                 "protocol: %d - %s\n",
                                 data->protocol,
-                                p->p_name);
+                                p ? p->p_name : "Unknown");
 
                         return;
                 }