From ee85aaccd219c2dd60bc0e1fa0a44d22f7b67142 Mon Sep 17 00:00:00 2001
From: Sylvain Rochet <gradator@gradator.net>
Date: Sun, 15 Feb 2015 11:15:07 +0100
Subject: [PATCH] PPP, removed low level create functions from PPP core

ppp_over_ethernet_create() moved from ppp.c to pppoe.c
ppp_over_l2tp_create() moved from ppp.c to pppol2tp.c
---
 src/api/pppapi.c                 |  2 ++
 src/include/netif/ppp/ppp.h      | 19 -------------------
 src/include/netif/ppp/pppoe.h    |  7 ++++---
 src/include/netif/ppp/pppol2tp.h |  6 +++---
 src/netif/ppp/ppp.c              | 17 -----------------
 src/netif/ppp/pppoe.c            | 15 +++++++++++----
 src/netif/ppp/pppol2tp.c         |  6 +++---
 7 files changed, 23 insertions(+), 49 deletions(-)

diff --git a/src/api/pppapi.c b/src/api/pppapi.c
index 13b5488d..e74686c5 100644
--- a/src/api/pppapi.c
+++ b/src/api/pppapi.c
@@ -37,6 +37,8 @@
 
 #include "lwip/pppapi.h"
 #include "lwip/tcpip.h"
+#include "netif/ppp/pppoe.h"
+#include "netif/ppp/pppol2tp.h"
 
 /**
  * Call ppp_set_default() inside the tcpip_thread context.
diff --git a/src/include/netif/ppp/ppp.h b/src/include/netif/ppp/ppp.h
index 1cc987dd..f31544e1 100644
--- a/src/include/netif/ppp/ppp.h
+++ b/src/include/netif/ppp/ppp.h
@@ -491,25 +491,6 @@ struct ppp_pcb_s {
 ppp_pcb *ppp_over_serial_create(struct netif *pppif, sio_fd_t fd, ppp_link_status_cb_fn link_status_cb, void *ctx_cb);
 #endif /* PPPOS_SUPPORT */
 
-#if PPPOE_SUPPORT
-/*
- * Create a new PPP Over Ethernet (PPPoE) connection.
- *
- * Return 0 on success, an error code on failure.
- */
-ppp_pcb *ppp_over_ethernet_create(struct netif *pppif, struct netif *ethif, const char *service_name, const char *concentrator_name,
-                        ppp_link_status_cb_fn link_status_cb, void *ctx_cb);
-#endif /* PPPOE_SUPPORT */
-
-#if PPPOL2TP_SUPPORT
-/*
- * Create a new PPP Over L2TP (PPPoL2TP) connection.
- */
-ppp_pcb *ppp_over_l2tp_create(struct netif *pppif, struct netif *netif, ip_addr_t *ipaddr, u16_t port,
-		u8_t *secret, u8_t secret_len,
-		ppp_link_status_cb_fn link_status_cb, void *ctx_cb);
-#endif /* PPPOL2TP_SUPPORT */
-
 /*
  * Set auth helper, optional, you can either fill ppp_pcb->settings.
  *
diff --git a/src/include/netif/ppp/pppoe.h b/src/include/netif/ppp/pppoe.h
index c5cc978c..b61d0d1e 100644
--- a/src/include/netif/ppp/pppoe.h
+++ b/src/include/netif/ppp/pppoe.h
@@ -162,9 +162,10 @@ struct pppoe_softc {
 
 #define pppoe_init() /* compatibility define, no initialization needed */
 
-ppp_pcb *pppoe_create(struct netif *pppif,
-                      struct netif *ethif,
-                      ppp_link_status_cb_fn link_status_cb, void *ctx_cb);
+ppp_pcb *ppp_over_ethernet_create(struct netif *pppif,
+          struct netif *ethif,
+          const char *service_name, const char *concentrator_name,
+          ppp_link_status_cb_fn link_status_cb, void *ctx_cb);
 
 void pppoe_disc_input(struct netif *netif, struct pbuf *p);
 void pppoe_data_input(struct netif *netif, struct pbuf *p);
diff --git a/src/include/netif/ppp/pppol2tp.h b/src/include/netif/ppp/pppol2tp.h
index be8459f3..df1f6725 100644
--- a/src/include/netif/ppp/pppol2tp.h
+++ b/src/include/netif/ppp/pppol2tp.h
@@ -192,9 +192,9 @@ struct pppol2tp_pcb_s {
 
 
 /* Create a new L2TP session. */
-ppp_pcb *pppol2tp_create(struct netif *pppif,
-                      struct netif *netif, ip_addr_t *ipaddr, u16_t port, u8_t *secret, u8_t secret_len,
-                      ppp_link_status_cb_fn link_status_cb, void *ctx_cb);
+ppp_pcb *ppp_over_l2tp_create(struct netif *pppif, struct netif *netif, ip_addr_t *ipaddr, u16_t port,
+                u8_t *secret, u8_t secret_len,
+                ppp_link_status_cb_fn link_status_cb, void *ctx_cb);
 
 #endif /* PPPOL2TP_H_ */
 #endif /* PPP_SUPPORT && PPPOL2TP_SUPPORT */
diff --git a/src/netif/ppp/ppp.c b/src/netif/ppp/ppp.c
index 7c9a5fbd..173014df 100644
--- a/src/netif/ppp/ppp.c
+++ b/src/netif/ppp/ppp.c
@@ -246,23 +246,6 @@ void ppp_set_xaccm(ppp_pcb *pcb, ext_accm *accm) {
 }
 #endif /* PPPOS_SUPPORT */
 
-#if PPPOE_SUPPORT
-ppp_pcb *ppp_over_ethernet_create(struct netif *pppif, struct netif *ethif, const char *service_name, const char *concentrator_name,
-                        ppp_link_status_cb_fn link_status_cb, void *ctx_cb) {
-  LWIP_UNUSED_ARG(service_name);
-  LWIP_UNUSED_ARG(concentrator_name);
-  return pppoe_create(pppif, ethif, link_status_cb, ctx_cb);
-}
-#endif /* PPPOE_SUPPORT */
-
-#if PPPOL2TP_SUPPORT
-ppp_pcb *ppp_over_l2tp_create(struct netif *pppif, struct netif *netif, ip_addr_t *ipaddr, u16_t port,
-		u8_t *secret, u8_t secret_len,
-		ppp_link_status_cb_fn link_status_cb, void *ctx_cb) {
-  return pppol2tp_create(pppif, netif, ipaddr, port, secret, secret_len, link_status_cb, ctx_cb);
-}
-#endif /* PPPOL2TP_SUPPORT */
-
 void ppp_set_auth(ppp_pcb *pcb, u8_t authtype, const char *user, const char *passwd) {
 
 #if PAP_SUPPORT
diff --git a/src/netif/ppp/pppoe.c b/src/netif/ppp/pppoe.c
index c8effebc..9e9fda99 100644
--- a/src/netif/ppp/pppoe.c
+++ b/src/netif/ppp/pppoe.c
@@ -146,13 +146,20 @@ static struct pppoe_softc* pppoe_find_softc_by_hunique(u8_t *token, size_t len,
 /** linked list of created pppoe interfaces */
 static struct pppoe_softc *pppoe_softc_list;
 
-ppp_pcb*
-pppoe_create(struct netif *pppif,
-             struct netif *ethif,
-             ppp_link_status_cb_fn link_status_cb, void *ctx_cb)
+/*
+ * Create a new PPP Over Ethernet (PPPoE) connection.
+ *
+ * Return 0 on success, an error code on failure.
+ */
+ppp_pcb *ppp_over_ethernet_create(struct netif *pppif,
+          struct netif *ethif,
+          const char *service_name, const char *concentrator_name,
+          ppp_link_status_cb_fn link_status_cb, void *ctx_cb)
 {
   ppp_pcb *ppp;
   struct pppoe_softc *sc;
+  LWIP_UNUSED_ARG(service_name);
+  LWIP_UNUSED_ARG(concentrator_name);
 
   ppp = ppp_new(pppif, link_status_cb, ctx_cb);
   if (ppp == NULL) {
diff --git a/src/netif/ppp/pppol2tp.c b/src/netif/ppp/pppol2tp.c
index c31caa15..a9f9eb18 100644
--- a/src/netif/ppp/pppol2tp.c
+++ b/src/netif/ppp/pppol2tp.c
@@ -97,9 +97,9 @@ static err_t pppol2tp_xmit(pppol2tp_pcb *l2tp, struct pbuf *pb);
 
 
 /* Create a new L2TP session. */
-ppp_pcb *pppol2tp_create(struct netif *pppif,
-                      struct netif *netif, ip_addr_t *ipaddr, u16_t port, u8_t *secret, u8_t secret_len,
-                      ppp_link_status_cb_fn link_status_cb, void *ctx_cb) {
+ppp_pcb *ppp_over_l2tp_create(struct netif *pppif, struct netif *netif, ip_addr_t *ipaddr, u16_t port,
+                u8_t *secret, u8_t secret_len,
+                ppp_link_status_cb_fn link_status_cb, void *ctx_cb) {
   ppp_pcb *ppp;
   pppol2tp_pcb *l2tp;
   struct udp_pcb *udp;