openl2tp: Provide prototype for l2tp_api_rpc_check_request

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2022-08-29 23:31:24 -07:00
parent f88f52d563
commit 4e3e97ed27
3 changed files with 75 additions and 0 deletions

View File

@ -0,0 +1,28 @@
From ded84ed583e9b0617bc35ab1798032d18b873144 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 29 Aug 2022 23:30:02 -0700
Subject: [PATCH] l2tp_rpc_server.c: Add missing prototype for
l2tp_api_rpc_check_request
Upstream-Status: Inappropriate [no upstream]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Makefile b/Makefile
index 0815b31..2fa5b2f 100644
--- a/Makefile
+++ b/Makefile
@@ -236,6 +236,7 @@ endif
-$(RM) $@ $@.tmp
$(RPCGEN) $(RPCGENFLAGS) -m -o $@.tmp $<
cat $@.tmp | sed -e 's/switch (rqstp->rq_proc) {/if (l2tp_api_rpc_check_request(transp) < 0) return; switch (rqstp->rq_proc) {/' > $@
+ sed -i '21i int l2tp_api_rpc_check_request(SVCXPRT *xprt);' $@
%_client.c: %.x
-$(RM) $@
--
2.37.2

View File

@ -0,0 +1,45 @@
From 2bfdd02d288de92ff118bf41b54c135a6a318c19 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 29 Aug 2022 23:42:11 -0700
Subject: [PATCH] lex/yacc: Add missing function prototypes
Fixes build with clang15
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
l2tp_config_parse.y | 3 +++
l2tp_config_token.l | 3 +++
2 files changed, 6 insertions(+)
diff --git a/l2tp_config_parse.y b/l2tp_config_parse.y
index 4baf1e0..15392d0 100644
--- a/l2tp_config_parse.y
+++ b/l2tp_config_parse.y
@@ -29,6 +29,9 @@ static struct l2tp_api_session_msg_data session;
extern void l2tp_log(int level, char *fmt, ...);
extern void yyfatal(const char *s);
+extern const char *l2tp_strerror(int error);
+extern int yylex (void);
+extern void yyerror(const char *s);
%}
diff --git a/l2tp_config_token.l b/l2tp_config_token.l
index 9016af6..43b8f0a 100644
--- a/l2tp_config_token.l
+++ b/l2tp_config_token.l
@@ -15,6 +15,9 @@
#include "l2tp_config_types.h"
#include "l2tp_config_parse.h"
+extern void l2tp_log(int level, char *fmt, ...);
+extern const char *l2tp_strerror(int error);
+
void yyfatal(const char *s);
void yyerror(const char *s);
--
2.37.2

View File

@ -35,6 +35,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${PV}/${BP}.tar.gz \
file://run-ptest \
file://fix_linux_4.15_compile.patch \
file://0002-user-ipv6-structures.patch \
file://0001-l2tp_rpc_server.c-Add-missing-prototype-for-l2tp_api.patch \
file://0001-lex-yacc-Add-missing-function-prototypes.patch \
"
SRC_URI[md5sum] = "e3d08dedfb9e6a9a1e24f6766f6dadd0"
SRC_URI[sha256sum] = "1c97704d4b963a87fbc0e741668d4530933991515ae9ab0dffd11b5444f4860f"