Diff for /embedaddon/mpd/src/l2tp_ctrl.c between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2013/07/22 08:44:29 version 1.1.1.2, 2016/11/01 09:56:12
Line 296  static void ppp_l2tp_ctrl_dump(struct ppp_l2tp_ctrl *c Line 296  static void ppp_l2tp_ctrl_dump(struct ppp_l2tp_ctrl *c
                         struct ppp_l2tp_avp_list *list, const char *fmt, ...)                          struct ppp_l2tp_avp_list *list, const char *fmt, ...)
                         __printflike(3, 4);                          __printflike(3, 4);
 static const    char *ppp_l2tp_ctrl_state_str(enum l2tp_ctrl_state state);  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_orig_str(enum l2tp_sess_orig orig);
 static const    char *ppp_l2tp_sess_side_str(enum l2tp_sess_side side);  static const    char *ppp_l2tp_sess_side_str(enum l2tp_sess_side side);
   
Line 965  ppp_l2tp_ctrl_get_peer_name(struct ppp_l2tp_ctrl *ctrl Line 965  ppp_l2tp_ctrl_get_peer_name(struct ppp_l2tp_ctrl *ctrl
         return (0);          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   * Get the node path and hook name for the hook that corresponds
  * to a control connection's L2TP frames.   * to a control connection's L2TP frames.
Line 1116  ppp_l2tp_ctrl_setup_2(struct ppp_l2tp_ctrl *ctrl, Line 1121  ppp_l2tp_ctrl_setup_2(struct ppp_l2tp_ctrl *ctrl,
   
                 /* Make sure response was included */                  /* Make sure response was included */
                 if (ptrs->challengresp == NULL) {                  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,                          ppp_l2tp_ctrl_close(ctrl,
                             L2TP_RESULT_NOT_AUTH, 0, NULL);                              L2TP_RESULT_NOT_AUTH, 0, NULL);
                        return (0);                        return (-1);
                 }                  }
   
                 /* Calculate challenge response */                  /* Calculate challenge response */
Line 2566  ppp_l2tp_ctrl_state_str(enum l2tp_ctrl_state state) Line 2571  ppp_l2tp_ctrl_state_str(enum l2tp_ctrl_state state)
 }  }
   
 static const char *  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) {          switch (state) {
         case SS_WAIT_REPLY:          case SS_WAIT_REPLY:

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>