d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make ``show ipcp'' prettier and remove a few redundant includes.

Browse Source
This commit is contained in:
Brian Somers 1998-04-25 00:09:14 +00:00
parent 93cc258625
commit 50abd4c820
5 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.sbin/ppp/datalink.c
View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: datalink.c,v 1.1.2.45 1998/04/23 18:56:09 brian Exp $
* $Id: datalink.c,v 1.1.2.46 1998/04/24 19:16:02 brian Exp $
*/
#include <sys/types.h>
@ -466,8 +466,10 @@ datalink_AuthOk(struct datalink *dl)
LogPrintf(LogPHASE, "%s: Already in NETWORK phase\n", dl->name);
datalink_AuthNotOk(dl);
return;
} else
} else {
dl->bundle->ncp.mp.peer = dl->peer;
ipcp_SetLink(&dl->bundle->ncp.ipcp, &dl->physical->link);
}
AuthSelect(dl->bundle, dl->peer.authname, dl->physical);
FsmUp(&dl->physical->link.ccp.fsm);

3
usr.sbin/ppp/deflate.c
View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: deflate.c,v 1.6.4.11 1998/04/16 00:25:57 brian Exp $
* $Id: deflate.c,v 1.6.4.12 1998/04/24 19:15:24 brian Exp $
*/
#include <sys/types.h>
@ -40,7 +40,6 @@
#include "fsm.h"
#include "lcp.h"
#include "ccp.h"
#include "lcpproto.h"
#include "deflate.h"
/* Our state */

35
usr.sbin/ppp/ipcp.c
View File

@ -17,7 +17,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* $Id: ipcp.c,v 1.50.2.43 1998/04/23 18:56:14 brian Exp $
* $Id: ipcp.c,v 1.50.2.44 1998/04/24 19:15:39 brian Exp $
*
* TODO:
* o More RFC1772 backwoard compatibility
@ -265,9 +265,19 @@ ReportIpcpStatus(struct cmdargs const *arg)
}
prompt_Printf(arg->prompt, "\nDefaults:\n");
prompt_Printf(arg->prompt, " My Address: %s/%d\n",
prompt_Printf(arg->prompt, " My Address: %s/%d",
inet_ntoa(arg->bundle->ncp.ipcp.cfg.my_range.ipaddr),
arg->bundle->ncp.ipcp.cfg.my_range.width);
if (arg->bundle->ncp.ipcp.cfg.HaveTriggerAddress)
prompt_Printf(arg->prompt, " (trigger with %s)",
inet_ntoa(arg->bundle->ncp.ipcp.cfg.TriggerAddress));
prompt_Printf(arg->prompt, "\n VJ compression: %s (%d slots %s slot "
"compression)\n",
command_ShowNegval(arg->bundle->ncp.ipcp.cfg.vj.neg),
arg->bundle->ncp.ipcp.cfg.vj.slots,
arg->bundle->ncp.ipcp.cfg.vj.slotcomp ? "with" : "without");
if (iplist_isvalid(&arg->bundle->ncp.ipcp.cfg.peer_list))
prompt_Printf(arg->prompt, " His Address: %s\n",
arg->bundle->ncp.ipcp.cfg.peer_list.src);
@ -275,30 +285,17 @@ ReportIpcpStatus(struct cmdargs const *arg)
prompt_Printf(arg->prompt, " His Address: %s/%d\n",
inet_ntoa(arg->bundle->ncp.ipcp.cfg.peer_range.ipaddr),
arg->bundle->ncp.ipcp.cfg.peer_range.width);
prompt_Printf(arg->prompt, " DNS: %s, ",
inet_ntoa(arg->bundle->ncp.ipcp.cfg.ns.dns[0]));
prompt_Printf(arg->prompt, "%s\n",
inet_ntoa(arg->bundle->ncp.ipcp.cfg.ns.dns[1]));
prompt_Printf(arg->prompt, "%s, %s\n",
inet_ntoa(arg->bundle->ncp.ipcp.cfg.ns.dns[1]),
command_ShowNegval(arg->bundle->ncp.ipcp.cfg.ns.dns_neg));
prompt_Printf(arg->prompt, " NetBIOS NS: %s, ",
inet_ntoa(arg->bundle->ncp.ipcp.cfg.ns.nbns[0]));
prompt_Printf(arg->prompt, "%s\n",
inet_ntoa(arg->bundle->ncp.ipcp.cfg.ns.nbns[1]));
prompt_Printf(arg->prompt, "\nNegotiation:\n");
if (arg->bundle->ncp.ipcp.cfg.HaveTriggerAddress)
prompt_Printf(arg->prompt, " Trigger Address: %s\n",
inet_ntoa(arg->bundle->ncp.ipcp.cfg.TriggerAddress));
else
prompt_Printf(arg->prompt, " Trigger Address: MYADDR\n");
prompt_Printf(arg->prompt, " DNS: %s\n",
command_ShowNegval(arg->bundle->ncp.ipcp.cfg.ns.dns_neg));
prompt_Printf(arg->prompt, " VJ compression: %s (%d slots %s slot "
"compression)\n",
command_ShowNegval(arg->bundle->ncp.ipcp.cfg.vj.neg),
arg->bundle->ncp.ipcp.cfg.vj.slots,
arg->bundle->ncp.ipcp.cfg.vj.slotcomp ? "with" : "without");
prompt_Printf(arg->prompt, "\n");
throughput_disp(&arg->bundle->ncp.ipcp.throughput, arg->prompt);

3
usr.sbin/ppp/lcp.c
View File

@ -17,7 +17,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* $Id: lcp.c,v 1.55.2.46 1998/04/24 19:15:42 brian Exp $
* $Id: lcp.c,v 1.55.2.47 1998/04/24 19:16:05 brian Exp $
*
* TODO:
* o Limit data field length by MRU
@ -58,7 +58,6 @@
#include "mp.h"
#include "chat.h"
#include "auth.h"
#include "pap.h"
#include "chap.h"
#include "datalink.h"
#include "bundle.h"

3
usr.sbin/ppp/pred.c
View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: pred.c,v 1.20.2.9 1998/04/16 00:26:17 brian Exp $
* $Id: pred.c,v 1.20.2.10 1998/04/24 19:15:26 brian Exp $
*/
#include <sys/types.h>
@ -40,7 +40,6 @@
#include "fsm.h"
#include "lqr.h"
#include "hdlc.h"
#include "lcpproto.h"
#include "lcp.h"
#include "ccp.h"
#include "pred.h"