Merge pull request h2o#2489 from h2o/kazuho/failure-to-set-DONTFRAG-i…

…s-not-fatal [http3] fix startup failure when OS does not provide support for IP_DONTFRAG
moneytech · Nov 17, 2020 · 5223c33 · 5223c33
2 parents 8a5be4f + 55cb50a
commit 5223c33
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/lib/common/socket.c b/lib/common/socket.c
@@ -1510,7 +1510,7 @@ int h2o_socket_set_df_bit(int fd, int domain)
     do {                                                                                                                           \
         int optvar = _optvar;                                                                                                      \
         if (setsockopt(fd, ip, optname, &optvar, sizeof(optvar)) != 0) {                                                           \
-            perror("setsockopt(" H2O_TO_STR(optname) ")");                                                                         \
+            perror("failed to set the DF bit through setsockopt(" H2O_TO_STR(ip) ", " H2O_TO_STR(optname) ")");                    \
             return 0;                                                                                                              \
         }                                                                                                                          \
         return 1;                                                                                                                  \

diff --git a/src/main.c b/src/main.c
@@ -1215,12 +1215,11 @@ static int open_listener(int domain, int type, int protocol, struct sockaddr *ad
         if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) != 0)
             goto Error;
     } break;
-    case SOCK_DGRAM: {
+    case SOCK_DGRAM:
         /* UDP: set SO_REUSEPORT and DF bit */
         socket_reuseport(fd);
-        if (!h2o_socket_set_df_bit(fd, domain))
-            goto Error;
-    } break;
+        h2o_socket_set_df_bit(fd, domain);
+        break;
     default:
         h2o_fatal("unexpected socket type %d", type);
         break;