--- embedaddon/mpd/src/l2tp_ctrl.c	2013/07/22 08:44:29	1.1.1.1
+++ embedaddon/mpd/src/l2tp_ctrl.c	2016/11/01 09:56:12	1.1.1.2
@@ -296,7 +296,7 @@ static void	ppp_l2tp_ctrl_dump(struct ppp_l2tp_ctrl *c
 			struct ppp_l2tp_avp_list *list, const char *fmt, ...)
 			__printflike(3, 4);
 static const	char *ppp_l2tp_ctrl_state_str(enum l2tp_ctrl_state state);
-static const	char *ppp_l2tp_sess_state_str(enum l2tp_ctrl_state state);
+static const	char *ppp_l2tp_sess_state_str(enum l2tp_sess_state state);
 static const	char *ppp_l2tp_sess_orig_str(enum l2tp_sess_orig orig);
 static const	char *ppp_l2tp_sess_side_str(enum l2tp_sess_side side);
 
@@ -965,6 +965,11 @@ ppp_l2tp_ctrl_get_peer_name(struct ppp_l2tp_ctrl *ctrl
 	return (0);
 };
 
+char *
+ppp_l2tp_ctrl_get_peer_name_p(struct ppp_l2tp_ctrl *ctrl) {
+	return &(ctrl->peer_name[0]);
+};
+
 /*
  * Get the node path and hook name for the hook that corresponds
  * to a control connection's L2TP frames.
@@ -1116,10 +1121,10 @@ ppp_l2tp_ctrl_setup_2(struct ppp_l2tp_ctrl *ctrl,
 
 		/* Make sure response was included */
 		if (ptrs->challengresp == NULL) {
-			Log(LOG_WARNING, ("L2TP: SCCRP lacks challenge response"));
+			Log(LOG_WARNING, ("L2TP: SCCRP/SCCCN lacks challenge response"));
 			ppp_l2tp_ctrl_close(ctrl,
 			    L2TP_RESULT_NOT_AUTH, 0, NULL);
-			return (0);
+			return (-1);
 		}
 
 		/* Calculate challenge response */
@@ -2566,7 +2571,7 @@ ppp_l2tp_ctrl_state_str(enum l2tp_ctrl_state state)
 }
 
 static const char *
-ppp_l2tp_sess_state_str(enum l2tp_ctrl_state state)
+ppp_l2tp_sess_state_str(enum l2tp_sess_state state)
 {
 	switch (state) {
 	case SS_WAIT_REPLY: