[BACK]Return to if_spppsubr.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / sys / net

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/sys/net/if_spppsubr.c between version 1.252 and 1.253

version 1.252, 2021/06/01 04:59:50 version 1.253, 2021/06/01 05:04:06
Line 417  static enum cp_rcr_type
Line 417  static enum cp_rcr_type
 static void sppp_ipcp_confrej(struct sppp *, struct lcp_header *, int);  static void sppp_ipcp_confrej(struct sppp *, struct lcp_header *, int);
 static void sppp_ipcp_confnak(struct sppp *, struct lcp_header *, int);  static void sppp_ipcp_confnak(struct sppp *, struct lcp_header *, int);
 static void sppp_ipcp_tlu(struct sppp *);  static void sppp_ipcp_tlu(struct sppp *);
   static void sppp_ipcp_tld(struct sppp *);
 static void sppp_ipcp_scr(struct sppp *);  static void sppp_ipcp_scr(struct sppp *);
   
 static void sppp_ipv6cp_init(struct sppp *);  static void sppp_ipv6cp_init(struct sppp *);
Line 427  static enum cp_rcr_type
Line 428  static enum cp_rcr_type
 static void sppp_ipv6cp_confrej(struct sppp *, struct lcp_header *, int);  static void sppp_ipv6cp_confrej(struct sppp *, struct lcp_header *, int);
 static void sppp_ipv6cp_confnak(struct sppp *, struct lcp_header *, int);  static void sppp_ipv6cp_confnak(struct sppp *, struct lcp_header *, int);
 static void sppp_ipv6cp_tlu(struct sppp *);  static void sppp_ipv6cp_tlu(struct sppp *);
   static void sppp_ipv6cp_tld(struct sppp *);
 static void sppp_ipv6cp_scr(struct sppp *);  static void sppp_ipv6cp_scr(struct sppp *);
   
 static void sppp_pap_input(struct sppp *, struct mbuf *);  static void sppp_pap_input(struct sppp *, struct mbuf *);
Line 504  static const struct cp ipcp = {
Line 506  static const struct cp ipcp = {
         "ipcp",          "ipcp",
         sppp_up_event, sppp_down_event, sppp_ipcp_open,          sppp_up_event, sppp_down_event, sppp_ipcp_open,
         sppp_ipcp_close, sppp_to_event,          sppp_ipcp_close, sppp_to_event,
         sppp_ipcp_tlu, sppp_null, sppp_tls,          sppp_ipcp_tlu, sppp_ipcp_tld, sppp_tls,
         sppp_tlf, sppp_ipcp_scr, sppp_screply,          sppp_tlf, sppp_ipcp_scr, sppp_screply,
         sppp_ipcp_confreq, sppp_ipcp_confrej, sppp_ipcp_confnak,          sppp_ipcp_confreq, sppp_ipcp_confrej, sppp_ipcp_confnak,
 };  };
Line 519  static const struct cp ipv6cp = {
Line 521  static const struct cp ipv6cp = {
         "ipv6cp",          "ipv6cp",
         sppp_up_event, sppp_down_event, sppp_ipv6cp_open,          sppp_up_event, sppp_down_event, sppp_ipv6cp_open,
         sppp_close_event, sppp_to_event,          sppp_close_event, sppp_to_event,
         sppp_ipv6cp_tlu, sppp_null, sppp_tls,          sppp_ipv6cp_tlu, sppp_ipv6cp_tld, sppp_tls,
         sppp_tlf, sppp_ipv6cp_scr, sppp_screply,          sppp_tlf, sppp_ipv6cp_scr, sppp_screply,
         sppp_ipv6cp_confreq, sppp_ipv6cp_confrej, sppp_ipv6cp_confnak,          sppp_ipv6cp_confreq, sppp_ipv6cp_confrej, sppp_ipv6cp_confnak,
 };  };
Line 3936  sppp_ipcp_tlu(struct sppp *sp)
Line 3938  sppp_ipcp_tlu(struct sppp *sp)
 #ifdef INET  #ifdef INET
         struct ifnet *ifp;          struct ifnet *ifp;
   
         ifp = &sp->pp_if;  
         KASSERT(SPPP_WLOCKED(sp));          KASSERT(SPPP_WLOCKED(sp));
   
           ifp = &sp->pp_if;
         if ((sp->ipcp.flags & IPCP_MYADDR_DYN) &&          if ((sp->ipcp.flags & IPCP_MYADDR_DYN) &&
             ((sp->ipcp.flags & IPCP_MYADDR_SEEN) == 0)) {              ((sp->ipcp.flags & IPCP_MYADDR_SEEN) == 0)) {
                 log(LOG_WARNING, "%s: no IP address, closing IPCP\n",                  log(LOG_WARNING, "%s: no IP address, closing IPCP\n",
Line 3947  sppp_ipcp_tlu(struct sppp *sp)
Line 3950  sppp_ipcp_tlu(struct sppp *sp)
         } else {          } else {
                 /* we are up. Set addresses and notify anyone interested */                  /* we are up. Set addresses and notify anyone interested */
                 sppp_set_ip_addrs(sp);                  sppp_set_ip_addrs(sp);
                   rt_ifmsg(ifp);
         }          }
 #endif  #endif
 }  }
   
 static void  static void
   sppp_ipcp_tld(struct sppp *sp)
   {
   #ifdef INET
           struct ifnet *ifp;
   
           KASSERT(SPPP_WLOCKED(sp));
   
           ifp = &sp->pp_if;
           rt_ifmsg(ifp);
   #endif
   }
   
   static void
 sppp_ipcp_scr(struct sppp *sp)  sppp_ipcp_scr(struct sppp *sp)
 {  {
         uint8_t opt[6 /* compression */ + 6 /* address */ + 12 /* dns addresses */];          uint8_t opt[6 /* compression */ + 6 /* address */ + 12 /* dns addresses */];
Line 4483  end:
Line 4500  end:
 static void  static void
 sppp_ipv6cp_tlu(struct sppp *sp)  sppp_ipv6cp_tlu(struct sppp *sp)
 {  {
           struct ifnet *ifp;
   
         KASSERT(SPPP_WLOCKED(sp));          KASSERT(SPPP_WLOCKED(sp));
   
           ifp = &sp->pp_if;
         /* we are up - notify isdn daemon */          /* we are up - notify isdn daemon */
         sppp_notify_con_wlocked(sp);          sppp_notify_con_wlocked(sp);
           rt_ifmsg(ifp);
   }
   
   static void
   sppp_ipv6cp_tld(struct sppp *sp)
   {
           struct ifnet *ifp;
   
           KASSERT(SPPP_WLOCKED(sp));
   
           ifp = &sp->pp_if;
           rt_ifmsg(ifp);
 }  }
   
 static void  static void

Legend:
Removed from v.1.252  
changed lines
  Added in v.1.253

CVSweb <webmaster@jp.NetBSD.org>