From 587e0e3e0cf77b42a04cf49141ccf8814ce8b7b4 Mon Sep 17 00:00:00 2001
From: Sylvain Rochet <gradator@gradator.net>
Date: Fri, 27 Feb 2015 23:55:18 +0100
Subject: [PATCH] PPP, CORE, beautified ppp_set_auth()

Beautified, added PPPAUTHTYPE_MSCHAP_V2 choice support.
---
 src/include/netif/ppp/ppp.h | 13 ++++++------
 src/netif/ppp/ppp.c         | 42 +++++++------------------------------
 2 files changed, 14 insertions(+), 41 deletions(-)

diff --git a/src/include/netif/ppp/ppp.h b/src/include/netif/ppp/ppp.h
index 956c6a9d..310f1c7d 100644
--- a/src/include/netif/ppp/ppp.h
+++ b/src/include/netif/ppp/ppp.h
@@ -427,12 +427,13 @@ struct ppp_pcb_s {
  * which identifies exactly one authentication method.
  *
  */
-#define PPPAUTHTYPE_NONE   0x00
-#define PPPAUTHTYPE_PAP    0x01
-#define PPPAUTHTYPE_CHAP   0x02
-#define PPPAUTHTYPE_MSCHAP 0x04
-#define PPPAUTHTYPE_EAP    0x08
-#define PPPAUTHTYPE_ANY    0xff
+#define PPPAUTHTYPE_NONE      0x00
+#define PPPAUTHTYPE_PAP       0x01
+#define PPPAUTHTYPE_CHAP      0x02
+#define PPPAUTHTYPE_MSCHAP    0x04
+#define PPPAUTHTYPE_MSCHAP_V2 0x08
+#define PPPAUTHTYPE_EAP       0x10
+#define PPPAUTHTYPE_ANY       0xff
 void ppp_set_auth(ppp_pcb *pcb, u8_t authtype, const char *user, const char *passwd);
 
 /*
diff --git a/src/netif/ppp/ppp.c b/src/netif/ppp/ppp.c
index 074296d0..f1c05879 100644
--- a/src/netif/ppp/ppp.c
+++ b/src/netif/ppp/ppp.c
@@ -189,50 +189,22 @@ static err_t ppp_netif_output_ip6(struct netif *netif, struct pbuf *pb, const ip
 /*** PUBLIC FUNCTION DEFINITIONS ***/
 /***********************************/
 void ppp_set_auth(ppp_pcb *pcb, u8_t authtype, const char *user, const char *passwd) {
-
 #if PPP_AUTH_SUPPORT
-
 #if PAP_SUPPORT
-  if (authtype & PPPAUTHTYPE_PAP) {
-    pcb->settings.refuse_pap = 0;
-  } else {
-    pcb->settings.refuse_pap = 1;
-  }
+  pcb->settings.refuse_pap = !(authtype & PPPAUTHTYPE_PAP);
 #endif /* PAP_SUPPORT */
-
 #if CHAP_SUPPORT
-  if (authtype & PPPAUTHTYPE_CHAP) {
-    pcb->settings.refuse_chap = 0;
-  } else {
-    pcb->settings.refuse_chap = 1;
-  }
+  pcb->settings.refuse_chap = !(authtype & PPPAUTHTYPE_CHAP);
 #if MSCHAP_SUPPORT
-  if (authtype & PPPAUTHTYPE_MSCHAP) {
-    pcb->settings.refuse_mschap = 0;
-    pcb->settings.refuse_mschap_v2 = 0;
-  } else {
-    pcb->settings.refuse_mschap = 1;
-    pcb->settings.refuse_mschap_v2 = 1;
-  }
+  pcb->settings.refuse_mschap = !(authtype & PPPAUTHTYPE_MSCHAP);
+  pcb->settings.refuse_mschap_v2 = !(authtype & PPPAUTHTYPE_MSCHAP_V2);
 #endif /* MSCHAP_SUPPORT */
 #endif /* CHAP_SUPPORT */
-
 #if EAP_SUPPORT
-  if (authtype & PPPAUTHTYPE_EAP) {
-    pcb->settings.refuse_eap = 0;
-  } else {
-    pcb->settings.refuse_eap = 1;
-  }
+  pcb->settings.refuse_eap = !(authtype & PPPAUTHTYPE_EAP);
 #endif /* EAP_SUPPORT */
-
-  if (user) {
-    pcb->settings.user = user;
-  }
-
-  if (passwd) {
-    pcb->settings.passwd = passwd;
-  }
-
+  pcb->settings.user = user;
+  pcb->settings.passwd = passwd;
 #else /* PPP_AUTH_SUPPORT */
   LWIP_UNUSED_ARG(pcb);
   LWIP_UNUSED_ARG(authtype);