mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2025-03-25 16:44:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

improved FSM structure size

Browse Source
This commit is contained in:
Sylvain Rochet 2012-06-22 18:50:09 +02:00
parent 8f1eeb1025
commit 807afbc879
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/netif/ppp/fsm.c
View File

@ -234,7 +234,7 @@ static void terminate_layer(fsm *f, int nextstate) {
*/ */
void fsm_close(fsm *f, char *reason) { void fsm_close(fsm *f, char *reason) {
f->term_reason = reason; f->term_reason = reason;
f->term_reason_len = (reason == NULL? 0: strlen(reason)); f->term_reason_len = (reason == NULL? 0: LWIP_MIN(strlen(reason), 0xFF) );
switch( f->state ){ switch( f->state ){
case STARTING: case STARTING:
f->state = INITIAL; f->state = INITIAL;

29
src/netif/ppp/fsm.h
View File

@ -73,22 +73,23 @@
*/ */
typedef struct fsm { typedef struct fsm {
ppp_pcb *pcb; /* PPP Interface */ ppp_pcb *pcb; /* PPP Interface */
int protocol; /* Data Link Layer Protocol field value */
int state; /* State */
int flags; /* Contains option bits */
u_char id; /* Current id */
u_char reqid; /* Current request id */
u_char seen_ack; /* Have received valid Ack/Nak/Rej to Req */
int timeouttime; /* Timeout time in milliseconds */
int maxconfreqtransmits; /* Maximum Configure-Request transmissions */
int retransmits; /* Number of retransmissions left */
int maxtermtransmits; /* Maximum Terminate-Request transmissions */
int nakloops; /* Number of nak loops since last ack */
int rnakloops; /* Number of naks received */
int maxnakloops; /* Maximum number of nak loops tolerated */
struct fsm_callbacks *callbacks; /* Callback routines */ struct fsm_callbacks *callbacks; /* Callback routines */
char *term_reason; /* Reason for closing protocol */ char *term_reason; /* Reason for closing protocol */
int term_reason_len; /* Length of term_reason */ u8_t seen_ack; /* Have received valid Ack/Nak/Rej to Req */
/* -- This is our only flag, we might use u_int :1 if we have more flags */
u16_t protocol; /* Data Link Layer Protocol field value */
u8_t state; /* State */
u8_t flags; /* Contains option bits */
u8_t id; /* Current id */
u8_t reqid; /* Current request id */
u8_t timeouttime; /* Timeout time in seconds */
u8_t maxconfreqtransmits; /* Maximum Configure-Request transmissions */
u8_t retransmits; /* Number of retransmissions left */
u8_t maxtermtransmits; /* Maximum Terminate-Request transmissions */
u8_t nakloops; /* Number of nak loops since last ack */
u8_t rnakloops; /* Number of naks received */
u8_t maxnakloops; /* Maximum number of nak loops tolerated */
u8_t term_reason_len; /* Length of term_reason */
} fsm; } fsm;