Skip to content

Commit c518319

Browse files
KariHaapalehtoMika Leppänen
KariHaapalehto
authored and
Mika Leppänen
committed
Moved PPP from lwip directory to under netsocket
Moved PPP and renamed files and constants.
1 parent 398515a commit c518319

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+239
-210
lines changed

‎features/lwipstack/lwip-sys/lwip_tcp_isn.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,14 @@
8282
#define PPP_FAKED_ON 1
8383
#endif
8484

85-
#include "netif/ppp/ppp_opts.h"
86-
#include "netif/ppp/ppp.h"
87-
#include "netif/ppp/pppcrypt.h"
85+
#include "ppp_opts.h"
86+
#include "ppp.h"
87+
#include "pppcrypt.h"
8888

8989
#if PPP_FAKED_ON && !LWIP_USE_EXTERNAL_POLARSSL && !LWIP_USE_EXTERNAL_MBEDTLS
9090
#undef LWIP_INCLUDED_POLARSSL_MD5
9191
#define LWIP_INCLUDED_POLARSSL_MD5 1
92-
#include "netif/ppp/polarssl/lwip_md5.c"
92+
#include "polarssl/lwip_md5.c"
9393
#endif
9494

9595
static u8_t input[64];

‎features/lwipstack/lwip/src/core/lwip_init.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
#include "lwip/mld6.h"
5959
#include "lwip/api.h"
6060

61-
#include "netif/ppp/ppp_opts.h"
62-
#include "netif/ppp/ppp_impl.h"
61+
#include "ppp_opts.h"
62+
#include "ppp_impl.h"
6363

6464
#ifndef LWIP_SKIP_PACKING_CHECK
6565

‎features/lwipstack/lwip/src/core/lwip_memp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
#include "lwip/igmp.h"
6969
#include "lwip/timeouts.h"
7070
/* needed by default MEMP_NUM_SYS_TIMEOUT */
71-
#include "netif/ppp/ppp_opts.h"
71+
#include "ppp_opts.h"
7272
#include "lwip/netdb.h"
7373
#include "lwip/dns.h"
7474
#include "lwip/priv/nd6_priv.h"

‎features/lwipstack/lwip/src/netif/ppp/PPPD_FOLLOWUP renamed to ‎features/netsocket/ppp/PPPD_FOLLOWUP

File renamed without changes.

‎features/lwipstack/lwip/src/netif/ppp/lwip_auth.c renamed to ‎features/netsocket/ppp/auth.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
6969
*/
7070

71-
#include "netif/ppp/ppp_opts.h"
71+
#include "ppp_opts.h"
7272
#if PPP_SUPPORT /* don't build if not configured for use in lwipopts.h */
7373

7474
#if 0 /* UNUSED */
@@ -103,28 +103,28 @@
103103
#include <time.h>
104104
#endif /* UNUSED */
105105

106-
#include "netif/ppp/ppp_impl.h"
106+
#include "ppp_impl.h"
107107

108-
#include "netif/ppp/fsm.h"
109-
#include "netif/ppp/lcp.h"
108+
#include "fsm.h"
109+
#include "lcp.h"
110110
#if CCP_SUPPORT
111-
#include "netif/ppp/ccp.h"
111+
#include "ccp.h"
112112
#endif /* CCP_SUPPORT */
113113
#if ECP_SUPPORT
114-
#include "netif/ppp/ecp.h"
114+
#include "ecp.h"
115115
#endif /* ECP_SUPPORT */
116-
#include "netif/ppp/ipcp.h"
116+
#include "ipcp.h"
117117
#if PAP_SUPPORT
118-
#include "netif/ppp/upap.h"
118+
#include "upap.h"
119119
#endif /* PAP_SUPPORT */
120120
#if CHAP_SUPPORT
121-
#include "netif/ppp/chap-new.h"
121+
#include "chap-new.h"
122122
#endif /* CHAP_SUPPORT */
123123
#if EAP_SUPPORT
124-
#include "netif/ppp/eap.h"
124+
#include "eap.h"
125125
#endif /* EAP_SUPPORT */
126126
#if CBCP_SUPPORT
127-
#include "netif/ppp/cbcp.h"
127+
#include "cbcp.h"
128128
#endif
129129

130130
#if 0 /* UNUSED */

‎features/lwipstack/lwip/src/netif/ppp/lwip_ccp.c renamed to ‎features/netsocket/ppp/ccp.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,20 @@
2828
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
2929
*/
3030

31-
#include "netif/ppp/ppp_opts.h"
31+
#include "ppp_opts.h"
3232
#if PPP_SUPPORT && CCP_SUPPORT /* don't build if not configured for use in lwipopts.h */
3333

3434
#include <stdlib.h>
3535
#include <string.h>
3636

37-
#include "netif/ppp/ppp_impl.h"
37+
#include "ppp_impl.h"
3838

39-
#include "netif/ppp/fsm.h"
40-
#include "netif/ppp/ccp.h"
39+
#include "fsm.h"
40+
#include "ccp.h"
4141

4242
#if MPPE_SUPPORT
43-
#include "netif/ppp/lcp.h" /* lcp_close(), lcp_fsm */
44-
#include "netif/ppp/mppe.h" /* mppe_init() */
43+
#include "lcp.h" /* lcp_close(), lcp_fsm */
44+
#include "mppe.h" /* mppe_init() */
4545
#endif /* MPPE_SUPPORT */
4646

4747
/*

‎features/lwipstack/lwip/src/netif/ppp/lwip_chap-md5.c renamed to ‎features/netsocket/ppp/chap-md5.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,20 @@
2828
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
2929
*/
3030

31-
#include "netif/ppp/ppp_opts.h"
31+
#include "ppp_opts.h"
3232
#if PPP_SUPPORT && CHAP_SUPPORT /* don't build if not configured for use in lwipopts.h */
3333

3434
#if 0 /* UNUSED */
3535
#include <stdlib.h>
3636
#include <string.h>
3737
#endif /* UNUSED */
3838

39-
#include "netif/ppp/ppp_impl.h"
39+
#include "ppp_impl.h"
4040

41-
#include "netif/ppp/chap-new.h"
42-
#include "netif/ppp/chap-md5.h"
43-
#include "netif/ppp/magic.h"
44-
#include "netif/ppp/pppcrypt.h"
41+
#include "chap-new.h"
42+
#include "chap-md5.h"
43+
#include "magic.h"
44+
#include "pppcrypt.h"
4545

4646
#define MD5_HASH_SIZE 16
4747
#define MD5_MIN_CHALLENGE 17

‎features/lwipstack/lwip/src/netif/ppp/lwip_chap-new.c renamed to ‎features/netsocket/ppp/chap-new.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,26 +28,26 @@
2828
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
2929
*/
3030

31-
#include "netif/ppp/ppp_opts.h"
31+
#include "ppp_opts.h"
3232
#if PPP_SUPPORT && CHAP_SUPPORT /* don't build if not configured for use in lwipopts.h */
3333

3434
#if 0 /* UNUSED */
3535
#include <stdlib.h>
3636
#include <string.h>
3737
#endif /* UNUSED */
3838

39-
#include "netif/ppp/ppp_impl.h"
39+
#include "ppp_impl.h"
4040

4141
#if 0 /* UNUSED */
4242
#include "session.h"
4343
#endif /* UNUSED */
4444

45-
#include "netif/ppp/chap-new.h"
46-
#include "netif/ppp/chap-md5.h"
45+
#include "chap-new.h"
46+
#include "chap-md5.h"
4747
#if MSCHAP_SUPPORT
48-
#include "netif/ppp/chap_ms.h"
48+
#include "chap_ms.h"
4949
#endif
50-
#include "netif/ppp/magic.h"
50+
#include "magic.h"
5151

5252
#if 0 /* UNUSED */
5353
/* Hook for a plugin to validate CHAP challenge */

‎features/lwipstack/lwip/src/netif/ppp/lwip_chap_ms.c renamed to ‎features/netsocket/ppp/chap_ms.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
*
7575
*/
7676

77-
#include "netif/ppp/ppp_opts.h"
77+
#include "ppp_opts.h"
7878
#if PPP_SUPPORT && MSCHAP_SUPPORT /* don't build if not configured for use in lwipopts.h */
7979

8080
#if 0 /* UNUSED */
@@ -87,14 +87,14 @@
8787
#include <unistd.h>
8888
#endif /* UNUSED */
8989

90-
#include "netif/ppp/ppp_impl.h"
90+
#include "ppp_impl.h"
9191

92-
#include "netif/ppp/chap-new.h"
93-
#include "netif/ppp/chap_ms.h"
94-
#include "netif/ppp/pppcrypt.h"
95-
#include "netif/ppp/magic.h"
92+
#include "chap-new.h"
93+
#include "chap_ms.h"
94+
#include "pppcrypt.h"
95+
#include "magic.h"
9696
#if MPPE_SUPPORT
97-
#include "netif/ppp/mppe.h" /* For mppe_sha1_pad*, mppe_set_key() */
97+
#include "mppe.h" /* For mppe_sha1_pad*, mppe_set_key() */
9898
#endif /* MPPE_SUPPORT */
9999

100100
#define SHA1_SIGNATURE_SIZE 20

‎features/lwipstack/lwip/src/netif/ppp/lwip_demand.c renamed to ‎features/netsocket/ppp/demand.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
2929
*/
3030

31-
#include "netif/ppp/ppp_opts.h"
31+
#include "ppp_opts.h"
3232
#if PPP_SUPPORT && DEMAND_SUPPORT /* don't build if not configured for use in lwipopts.h */
3333

3434
#include <stdio.h>
@@ -52,11 +52,11 @@
5252
#include <pcap-bpf.h>
5353
#endif
5454

55-
#include "netif/ppp/ppp_impl.h"
55+
#include "ppp_impl.h"
5656

57-
#include "netif/ppp/fsm.h"
58-
#include "netif/ppp/ipcp.h"
59-
#include "netif/ppp/lcp.h"
57+
#include "fsm.h"
58+
#include "ipcp.h"
59+
#include "lcp.h"
6060

6161
char *frame;
6262
int framelen;

0 commit comments

Comments
 (0)