mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-04 12:52:15 +00:00
Code Issues Releases Activity

int var : 1' -> unsigned var : 1'.

Browse Source 
This made things look silly and made us mis-negotiate the
number of VJ slots.
This commit is contained in:
Brian Somers 1998-04-05 19:02:49 +00:00
parent f91ad6b0b7
commit a3e274968f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/cvs2svn/branches/MP/; revision=35048
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.sbin/ppp/ipcp.h
View File

@ -15,7 +15,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* $Id: ipcp.h,v 1.18.2.17 1998/03/16 22:53:59 brian Exp $
* $Id: ipcp.h,v 1.18.2.18 1998/04/03 19:24:00 brian Exp $
*
* TODO:
*/
@ -44,7 +44,7 @@ struct ipcp {
struct {
int VJInitSlots; /* Maximum VJ slots */
int VJInitComp : 1; /* Slot compression */
unsigned VJInitComp : 1; /* Slot compression */
struct in_range my_range; /* MYADDR spec */
struct in_addr netmask; /* netmask (unused by most OSs) */
@ -52,7 +52,7 @@ struct ipcp {
struct iplist peer_list; /* Ranges of HISADDR values */
struct in_addr TriggerAddress; /* Address to suggest in REQ */
int HaveTriggerAddress : 1; /* Trigger address specified */
unsigned HaveTriggerAddress : 1; /* Trigger address specified */
#ifndef NOMSEXT
struct in_addr ns_entries[2]; /* DNS addresses offered */
@ -67,7 +67,7 @@ struct ipcp {
} vj;
int heis1172 : 1; /* True if he is speaking rfc1172 */
unsigned heis1172 : 1; /* True if he is speaking rfc1172 */
struct in_addr peer_ip; /* IP address he's willing to use */
u_int32_t peer_compproto; /* VJ params he's willing to use */

12
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.37 1998/04/03 19:26:12 brian Exp $
* $Id: lcp.c,v 1.55.2.38 1998/04/03 19:26:21 brian Exp $
*
* TODO:
* o Limit data field length by MRU
@ -149,16 +149,18 @@ lcp_ReportStatus(struct cmdargs const *arg)
prompt_Printf(arg->prompt, "%s: %s [%s]\n", l->name, lcp->fsm.name,
State2Nam(lcp->fsm.state));
prompt_Printf(arg->prompt,
" his side: MRU %d, ACCMAP %08lx, PROTOCOMP %d, ACFCOMP %d,\n"
" his side: MRU %d, ACCMAP %08lx, PROTOCOMP %s, ACFCOMP %s,\n"
" MAGIC %08lx, REJECT %04x\n",
lcp->his_mru, (u_long)lcp->his_accmap,
lcp->his_protocomp, lcp->his_acfcomp,
lcp->his_protocomp ? "on" : "off",
lcp->his_acfcomp ? "on" : "off",
(u_long)lcp->his_magic, lcp->his_reject);
prompt_Printf(arg->prompt,
" my side: MRU %d, ACCMAP %08lx, PROTOCOMP %d, ACFCOMP %d,\n"
" my side: MRU %d, ACCMAP %08lx, PROTOCOMP %s, ACFCOMP %s,\n"
" MAGIC %08lx, REJECT %04x\n",
lcp->want_mru, (u_long)lcp->want_accmap,
lcp->want_protocomp, lcp->want_acfcomp,
lcp->want_protocomp ? "on" : "off",
lcp->want_acfcomp ? "on" : "off",
(u_long)lcp->want_magic, lcp->my_reject);
prompt_Printf(arg->prompt, "\n Defaults: MRU = %d, ", lcp->cfg.mru);

6
usr.sbin/ppp/lcp.h
View File

@ -15,7 +15,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* $Id: lcp.h,v 1.16.2.16 1998/04/03 19:21:31 brian Exp $
* $Id: lcp.h,v 1.16.2.17 1998/04/03 19:24:03 brian Exp $
*
* TODO:
*/
@ -28,8 +28,8 @@ struct lcp {
u_int32_t his_accmap; /* Peeers async char control map */
u_int32_t his_magic; /* Peers magic number */
u_int32_t his_lqrperiod; /* Peers LQR frequency */
int his_protocomp : 1; /* Does peer do Protocol field compression */
int his_acfcomp : 1; /* Does peer do addr & cntrl fld compression */
unsigned his_protocomp : 1; /* Does peer do Protocol field compression */
unsigned his_acfcomp : 1; /* Does peer do addr & cntrl fld compression */
u_short his_auth; /* Peer wants this type of authentication */
u_short want_mru; /* Our maximum packet size */