From patchwork Tue Mar 28 20:29:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 744514 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vt2ZL6V7Mz9s76 for ; Wed, 29 Mar 2017 07:30:02 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 64ABD895CC; Tue, 28 Mar 2017 20:30:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9YgSYZCEcYrx; Tue, 28 Mar 2017 20:30:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id A4A1989411; Tue, 28 Mar 2017 20:30:00 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 4EA651BFC3F for ; Tue, 28 Mar 2017 20:30:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4A0B38909B for ; Tue, 28 Mar 2017 20:30:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id e0QfI1Ya7hvx for ; Tue, 28 Mar 2017 20:29:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by whitealder.osuosl.org (Postfix) with ESMTPS id 0FD0084D65 for ; Tue, 28 Mar 2017 20:29:58 +0000 (UTC) Received: from linux.local ([178.7.114.12]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0M8axL-1bxIaK1kjz-00wEto; Tue, 28 Mar 2017 22:29:51 +0200 From: Peter Seiderer To: buildroot@busybox.net Date: Tue, 28 Mar 2017 22:29:49 +0200 Message-Id: <20170328202949.1762-1-ps.report@gmx.net> X-Mailer: git-send-email 2.11.0 X-Provags-ID: V03:K0:+JTz3ZQkYopCw/fl8xm3PiGaRQOhuySIRGsGktyDj17cbIbjDpM jBl/3PosGy6M00yBBr9AmFWJF8cT/5p3FDg8ah2y39T64EFydTcKnPAUMl4BbRTd4VkJhoz NGgcBcX0QWvLdH7aqymaaCbkzZ5av/qkDJzkx22zTgE4T6OQyt8zWtRMLW7GTCQE8lY3zdt r/ChLgzqtvrsbJwzake+g== X-UI-Out-Filterresults: notjunk:1; V01:K0:Xu3CSKhv+KE=:NI+zHvKp7g6hgTJpugpK04 epemGR6kKob6l1wcveOrUJzCf7bDxTLdvLLqb5QyNznW5kx3LwUm/Zmy9Fe0AZIWTz09Xirn7 3dfKpVANb5AYTmr9PstzVMZgZK4D1tiwgi1cLL4D/FLBoNlcQbNtXC+UjQOKk/cOq2rVI0MBU n611mE3vNA1tv8wTZ9dL4oJ8xb3uacT96RMGOX9K0lX+V2XE8cTZDv4CmLz8SebmkevRJhZkm CxaGBXjhmh/NNTZDJAA7GNqfjpYWiM0Icc2AmqtUoTOiVhW129MgLHV49lSn9VcaCukv/6lCr RbYtWZgnGDVZ+lBftnE/F3MICQ85zzQO0ZM1K/taE2rYsSXtXjs4Avrh1/eSfu7THMxkZk5AJ 2MbHpkMxTnltdT9ykwudPaCVbEaSlfvVMRSr9C1fq6wJwmTJey06ryQd62lxfvyUYYaoG+b0X baZmMGG6u7vXHHIuRU3Bw64E9UhHnJ+ZtxrVTSapNguMELTByiu+a/5TjNbAT31LWF1A3tl6p Y3pefhJDbrVoG546YYlTR6mV6iT4GJ1vg6pfUMHL0Be0VsWh+8NT/yd1fIzX5+NKfc1+hVbzP HYcuoqO0yFh9FIgNvTDVuq6jYEpWKYWEn97di+doVdgFY78B0XYC5OhuUboIc8YHDQKkMggri sm3FKfaM5D1t7mJDCPAzA7XfXIG4j9jjfODgBSF/CBW2srQ6qPiOJqN2+j1ZET8x+bFNCi0tr y+6ztxtwtBzTVBhV9rYI8NndYVRUpFTT4wWvIJtonV5alOu/kbBD+MUaPM4= Cc: Rahul Jain Subject: [Buildroot] [PATCH v1] uhtppd: fix TCP_FASTOPEN related compile error X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes [1]: .../uhttpd-a8bf9c00842224edb394e79909053f7628ee6a82/listen.c: In function 'uh_setup_listeners': .../uhttpd-a8bf9c00842224edb394e79909053f7628ee6a82/listen.c:120:30: error: 'TCP_FASTOPEN' undeclared (first use in this function) [1] http://autobuild.buildroot.net/results/56e/56e0727ccd1255b05e03d1b79dc238bd88701230 Signed-off-by: Peter Seiderer --- ...02-Fix-TCP_FASTOPEN-related-compile-error.patch | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 package/uhttpd/0002-Fix-TCP_FASTOPEN-related-compile-error.patch diff --git a/package/uhttpd/0002-Fix-TCP_FASTOPEN-related-compile-error.patch b/package/uhttpd/0002-Fix-TCP_FASTOPEN-related-compile-error.patch new file mode 100644 index 000000000..887e7d846 --- /dev/null +++ b/package/uhttpd/0002-Fix-TCP_FASTOPEN-related-compile-error.patch @@ -0,0 +1,44 @@ +From e6c53cca170388e97e2d25c4429e0fd16739778b Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Tue, 28 Mar 2017 22:22:02 +0200 +Subject: [PATCH] Fix TCP_FASTOPEN related compile error. + +Signed-off-by: Peter Seiderer +--- + listen.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/listen.c b/listen.c +index 2a54888..727bff8 100644 +--- a/listen.c ++++ b/listen.c +@@ -107,18 +107,24 @@ void uh_setup_listeners(void) + /* TCP keep-alive */ + if (conf.tcp_keepalive > 0) { + #ifdef linux +- int tcp_ka_idl, tcp_ka_int, tcp_ka_cnt, tcp_fstopn; ++ int tcp_ka_idl, tcp_ka_int, tcp_ka_cnt; ++#ifdef TCP_FASTOPEN ++ int tcp_fstopn; ++#endif + + tcp_ka_idl = 1; + tcp_ka_cnt = 3; + tcp_ka_int = conf.tcp_keepalive; ++#ifdef TCP_FASTOPEN + tcp_fstopn = 5; +- ++#endif + setsockopt(sock, SOL_TCP, TCP_KEEPIDLE, &tcp_ka_idl, sizeof(tcp_ka_idl)); + setsockopt(sock, SOL_TCP, TCP_KEEPINTVL, &tcp_ka_int, sizeof(tcp_ka_int)); + setsockopt(sock, SOL_TCP, TCP_KEEPCNT, &tcp_ka_cnt, sizeof(tcp_ka_cnt)); ++#ifdef TCP_FASTOPEN + setsockopt(sock, SOL_TCP, TCP_FASTOPEN, &tcp_fstopn, sizeof(tcp_fstopn)); + #endif ++#endif + + setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, &yes, sizeof(yes)); + } +-- +2.11.0 +