Skip to content

L
linux
Commit 630aee50 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files
Options

o LLC: consolidate the LLC station component into llc_station.c 

Deleting llc_actn.[ch], llc_evnt.[ch] & llc_stat.[ch], now it is
clearly separated from the rest and lots of previously externally
visible thru headers stuff is nicely restrained in this file.

Also remove the silly passing around of pointers to llc_main_station,
use it directly.
parent ae15ab84
Hide whitespace changes
Inline Side-by-side
Showing with 507 additions and 720 deletions
include/net/llc.h
View file @ 630aee50
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
*/ */
#include <linux/if.h> #include <linux/if.h>
#include <linux/if_ether.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
...@@ -60,10 +61,14 @@ struct llc_sap { ...@@ -60,10 +61,14 @@ struct llc_sap {
extern struct list_head llc_sap_list; extern struct list_head llc_sap_list;
extern rwlock_t llc_sap_list_lock; extern rwlock_t llc_sap_list_lock;
extern unsigned char llc_station_mac_sa[ETH_ALEN];
extern int llc_rcv(struct sk_buff *skb, struct net_device *dev, extern int llc_rcv(struct sk_buff *skb, struct net_device *dev,
struct packet_type *pt); struct packet_type *pt);
extern int llc_mac_hdr_init(struct sk_buff *skb,
unsigned char *sa, unsigned char *da);
extern void llc_add_pack(int type, void (*handler)(struct llc_sap *sap, extern void llc_add_pack(int type, void (*handler)(struct llc_sap *sap,
struct sk_buff *skb)); struct sk_buff *skb));
extern void llc_remove_pack(int type); extern void llc_remove_pack(int type);
......
include/net/llc_actn.h deleted 100644 → 0
View file @ ae15ab84
#ifndef LLC_ACTN_H
#define LLC_ACTN_H
/*
* Copyright (c) 1997 by Procom Technology,Inc.
* 2001 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
*
* This program can be redistributed or modified under the terms of the
* GNU General Public License as published by the Free Software Foundation.
* This program is distributed without any warranty or implied warranty
* of merchantability or fitness for a particular purpose.
*
* See the GNU General Public License for more details.
*/
/* Station component state transition actions */
#define LLC_STATION_AC_START_ACK_TMR 1
#define LLC_STATION_AC_SET_RETRY_CNT_0 2
#define LLC_STATION_AC_INC_RETRY_CNT_BY_1 3
#define LLC_STATION_AC_SET_XID_R_CNT_0 4
#define LLC_STATION_AC_INC_XID_R_CNT_BY_1 5
#define LLC_STATION_AC_SEND_NULL_DSAP_XID_C 6
#define LLC_STATION_AC_SEND_XID_R 7
#define LLC_STATION_AC_SEND_TEST_R 8
#define LLC_STATION_AC_REPORT_STATUS 9
/* All station state event action functions look like this */
typedef int (*llc_station_action_t)(struct llc_station *station,
struct sk_buff *skb);
extern int llc_station_ac_start_ack_timer(struct llc_station *station,
struct sk_buff *skb);
extern int llc_station_ac_set_retry_cnt_0(struct llc_station *station,
struct sk_buff *skb);
extern int llc_station_ac_inc_retry_cnt_by_1(struct llc_station *station,
struct sk_buff *skb);
extern int llc_station_ac_set_xid_r_cnt_0(struct llc_station *station,
struct sk_buff *skb);
extern int llc_station_ac_inc_xid_r_cnt_by_1(struct llc_station *station,
struct sk_buff *skb);
extern int llc_station_ac_send_null_dsap_xid_c(struct llc_station *station,
struct sk_buff *skb);
extern int llc_station_ac_send_xid_r(struct llc_station *station,
struct sk_buff *skb);
extern int llc_station_ac_send_test_r(struct llc_station *station,
struct sk_buff *skb);
extern int llc_station_ac_report_status(struct llc_station *station,
struct sk_buff *skb);
extern int llc_station_ac_report_status(struct llc_station *station,
struct sk_buff *skb);
extern void llc_station_ack_tmr_cb(unsigned long timeout_data);
#endif /* LLC_ACTN_H */
include/net/llc_evnt.h deleted 100644 → 0
View file @ ae15ab84
#ifndef LLC_EVNT_H
#define LLC_EVNT_H
/*
* Copyright (c) 1997 by Procom Technology,Inc.
* 2001 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
*
* This program can be redistributed or modified under the terms of the
* GNU General Public License as published by the Free Software Foundation.
* This program is distributed without any warranty or implied warranty
* of merchantability or fitness for a particular purpose.
*
* See the GNU General Public License for more details.
*/
/* Station component state transition events */
/* Types of events (possible values in 'ev->type') */
#define LLC_STATION_EV_TYPE_SIMPLE 1
#define LLC_STATION_EV_TYPE_CONDITION 2
#define LLC_STATION_EV_TYPE_PRIM 3
#define LLC_STATION_EV_TYPE_PDU 4 /* command/response PDU */
#define LLC_STATION_EV_TYPE_ACK_TMR 5
#define LLC_STATION_EV_TYPE_RPT_STATUS 6
/* Events */
#define LLC_STATION_EV_ENABLE_WITH_DUP_ADDR_CHECK 1
#define LLC_STATION_EV_ENABLE_WITHOUT_DUP_ADDR_CHECK 2
#define LLC_STATION_EV_ACK_TMR_EXP_LT_RETRY_CNT_MAX_RETRY 3
#define LLC_STATION_EV_ACK_TMR_EXP_EQ_RETRY_CNT_MAX_RETRY 4
#define LLC_STATION_EV_RX_NULL_DSAP_XID_C 5
#define LLC_STATION_EV_RX_NULL_DSAP_0_XID_R_XID_R_CNT_EQ 6
#define LLC_STATION_EV_RX_NULL_DSAP_1_XID_R_XID_R_CNT_EQ 7
#define LLC_STATION_EV_RX_NULL_DSAP_TEST_C 8
#define LLC_STATION_EV_DISABLE_REQ 9
struct llc_station_state_ev {
u8 type;
u8 prim;
u8 prim_type;
u8 reason;
struct list_head node; /* node in station->ev_q.list */
};
static __inline__ struct llc_station_state_ev *
llc_station_ev(struct sk_buff *skb)
{
return (struct llc_station_state_ev *)skb->cb;
}
struct llc_station;
typedef int (*llc_station_ev_t)(struct llc_station *station,
struct sk_buff *skb);
extern int llc_stat_ev_enable_with_dup_addr_check(struct llc_station *station,
struct sk_buff *skb);
extern int llc_stat_ev_enable_without_dup_addr_check(struct llc_station *station,
struct sk_buff *skb);
extern int llc_stat_ev_ack_tmr_exp_lt_retry_cnt_max_retry(struct llc_station *
station,
struct sk_buff *skb);
extern int llc_stat_ev_ack_tmr_exp_eq_retry_cnt_max_retry(struct llc_station *station,
struct sk_buff *skb);
extern int llc_stat_ev_rx_null_dsap_xid_c(struct llc_station *station,
struct sk_buff *skb);
extern int llc_stat_ev_rx_null_dsap_0_xid_r_xid_r_cnt_eq(struct llc_station *station,
struct sk_buff *skb);
extern int llc_stat_ev_rx_null_dsap_1_xid_r_xid_r_cnt_eq(struct llc_station *station,
struct sk_buff *skb);
extern int llc_stat_ev_rx_null_dsap_test_c(struct llc_station *station,
struct sk_buff *skb);
extern int llc_stat_ev_disable_req(struct llc_station *station,
struct sk_buff *skb);
#endif /* LLC_EVNT_H */
include/net/llc_stat.h deleted 100644 → 0
View file @ ae15ab84
#ifndef LLC_STAT_H
#define LLC_STAT_H
/*
* Copyright (c) 1997 by Procom Technology,Inc.
* 2001 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
*
* This program can be redistributed or modified under the terms of the
* GNU General Public License as published by the Free Software Foundation.
* This program is distributed without any warranty or implied warranty
* of merchantability or fitness for a particular purpose.
*
* See the GNU General Public License for more details.
*/
/* Station component state table */
/* Station component states */
#define LLC_STATION_STATE_DOWN 1 /* initial state */
#define LLC_STATION_STATE_DUP_ADDR_CHK 2
#define LLC_STATION_STATE_UP 3
#define LLC_NBR_STATION_STATES 3 /* size of state table */
/* Station component state table structure */
struct llc_station_state_trans {
llc_station_ev_t ev;
u8 next_state;
llc_station_action_t *ev_actions;
};
struct llc_station_state {
u8 curr_state;
struct llc_station_state_trans **transitions;
};
extern struct llc_station_state llc_station_state_table[LLC_NBR_STATION_STATES];
#endif /* LLC_STAT_H */
include/net/llc_station.h
View file @ 630aee50
...@@ -41,7 +41,6 @@ struct llc_station { ...@@ -41,7 +41,6 @@ struct llc_station {
struct timer_list ack_timer; struct timer_list ack_timer;
u8 retry_count; u8 retry_count;
u8 maximum_retry; u8 maximum_retry;
u8 mac_sa[6];
struct { struct {
struct sk_buff_head list; struct sk_buff_head list;
spinlock_t lock; spinlock_t lock;
...@@ -49,10 +48,6 @@ struct llc_station { ...@@ -49,10 +48,6 @@ struct llc_station {
struct sk_buff_head mac_pdu_q; struct sk_buff_head mac_pdu_q;
}; };
extern void llc_station_state_process(struct llc_station *station,
struct sk_buff *skb);
extern void llc_station_send_pdu(struct llc_station *station,
struct sk_buff *skb);
extern int __init llc_station_init(void); extern int __init llc_station_init(void);
extern void __exit llc_station_exit(void); extern void __exit llc_station_exit(void);
#endif /* LLC_STATION_H */ #endif /* LLC_STATION_H */
net/llc/Makefile
View file @ 630aee50
...@@ -19,7 +19,6 @@ llc-y := llc_core.o llc_input.o llc_output.o ...@@ -19,7 +19,6 @@ llc-y := llc_core.o llc_input.o llc_output.o
obj-$(CONFIG_LLC2) += llc2.o obj-$(CONFIG_LLC2) += llc2.o
llc2-y := llc_if.o llc_c_ev.o llc_c_ac.o llc_conn.o llc_c_st.o llc_pdu.o \ llc2-y := llc_if.o llc_c_ev.o llc_c_ac.o llc_conn.o llc_c_st.o llc_pdu.o \
llc_sap.o llc_s_ac.o llc_s_ev.o llc_s_st.o af_llc.o llc_station.o \ llc_sap.o llc_s_ac.o llc_s_ev.o llc_s_st.o af_llc.o llc_station.o
llc_actn.o llc_stat.o llc_evnt.o
llc2-$(CONFIG_PROC_FS) += llc_proc.o llc2-$(CONFIG_PROC_FS) += llc_proc.o
net/llc/llc_actn.c deleted 100644 → 0
View file @ ae15ab84
/*
* llc_actn.c - Implementation of actions of station component of LLC
*
* Description :
* Functions in this module are implementation of station component actions.
* Details of actions can be found in IEEE-802.2 standard document.
* All functions have one station and one event as input argument. All of
* them return 0 On success and 1 otherwise.
*
* Copyright (c) 1997 by Procom Technology, Inc.
* 2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
*
* This program can be redistributed or modified under the terms of the
* GNU General Public License as published by the Free Software Foundation.
* This program is distributed without any warranty or implied warranty
* of merchantability or fitness for a particular purpose.
*
* See the GNU General Public License for more details.
*/
#include <linux/netdevice.h>
#include <net/llc_if.h>
#include <net/llc_evnt.h>
#include <net/llc_pdu.h>
#include <net/llc_sap.h>
#include <net/llc_station.h>
#include "llc_output.h"
int llc_station_ac_start_ack_timer(struct llc_station *station,
struct sk_buff *skb)
{
mod_timer(&station->ack_timer, jiffies + LLC_ACK_TIME * HZ);
return 0;
}
int llc_station_ac_set_retry_cnt_0(struct llc_station *station,
struct sk_buff *skb)
{
station->retry_count = 0;
return 0;
}
int llc_station_ac_inc_retry_cnt_by_1(struct llc_station *station,
struct sk_buff *skb)
{
station->retry_count++;
return 0;
}
int llc_station_ac_set_xid_r_cnt_0(struct llc_station *station,
struct sk_buff *skb)
{
station->xid_r_count = 0;
return 0;
}
int llc_station_ac_inc_xid_r_cnt_by_1(struct llc_station *station,
struct sk_buff *skb)
{
station->xid_r_count++;
return 0;
}
int llc_station_ac_send_null_dsap_xid_c(struct llc_station *station,
struct sk_buff *skb)
{
int rc = 1;
struct sk_buff *nskb = llc_alloc_frame();
if (!nskb)
goto out;
llc_pdu_header_init(nskb, LLC_PDU_TYPE_U, 0, 0, LLC_PDU_CMD);
llc_pdu_init_as_xid_cmd(nskb, LLC_XID_NULL_CLASS_2, 127);
rc = llc_mac_hdr_init(nskb, station->mac_sa, station->mac_sa);
if (rc)
goto free;
llc_station_send_pdu(station, nskb);
out:
return rc;
free:
kfree_skb(skb);
goto out;
}
int llc_station_ac_send_xid_r(struct llc_station *station,
struct sk_buff *skb)
{
u8 mac_da[ETH_ALEN], dsap;
int rc = 1;
struct sk_buff* nskb = llc_alloc_frame();
if (!nskb)
goto out;
rc = 0;
nskb->dev = skb->dev;
llc_pdu_decode_sa(skb, mac_da);
llc_pdu_decode_ssap(skb, &dsap);
llc_pdu_header_init(nskb, LLC_PDU_TYPE_U, 0, dsap, LLC_PDU_RSP);
llc_pdu_init_as_xid_rsp(nskb, LLC_XID_NULL_CLASS_2, 127);
rc = llc_mac_hdr_init(nskb, station->mac_sa, mac_da);
if (rc)
goto free;
llc_station_send_pdu(station, nskb);
out:
return rc;
free:
kfree_skb(skb);
goto out;
}
int llc_station_ac_send_test_r(struct llc_station *station,
struct sk_buff *skb)
{
u8 mac_da[ETH_ALEN], dsap;
int rc = 1;
struct sk_buff *nskb = llc_alloc_frame();
if (!nskb)
goto out;
rc = 0;
nskb->dev = skb->dev;
llc_pdu_decode_sa(skb, mac_da);
llc_pdu_decode_ssap(skb, &dsap);
llc_pdu_header_init(nskb, LLC_PDU_TYPE_U, 0, dsap, LLC_PDU_RSP);
llc_pdu_init_as_test_rsp(nskb, skb);
rc = llc_mac_hdr_init(nskb, station->mac_sa, mac_da);
if (rc)
goto free;
llc_station_send_pdu(station, nskb);
out:
return rc;
free:
kfree_skb(skb);
goto out;
}
int llc_station_ac_report_status(struct llc_station *station,
struct sk_buff *skb)
{
return 0;
}
void llc_station_ack_tmr_cb(unsigned long timeout_data)
{
struct llc_station *station = (struct llc_station *)timeout_data;
struct sk_buff *skb = alloc_skb(0, GFP_ATOMIC);
if (skb) {
struct llc_station_state_ev *ev = llc_station_ev(skb);
ev->type = LLC_STATION_EV_TYPE_ACK_TMR;
llc_station_state_process(station, skb);
}
}
net/llc/llc_core.c
View file @ 630aee50
...@@ -171,6 +171,7 @@ static void __exit llc_exit(void) ...@@ -171,6 +171,7 @@ static void __exit llc_exit(void)
module_init(llc_init); module_init(llc_init);
module_exit(llc_exit); module_exit(llc_exit);
EXPORT_SYMBOL(llc_station_mac_sa);
EXPORT_SYMBOL(llc_sap_list); EXPORT_SYMBOL(llc_sap_list);
EXPORT_SYMBOL(llc_sap_list_lock); EXPORT_SYMBOL(llc_sap_list_lock);
EXPORT_SYMBOL(llc_sap_find); EXPORT_SYMBOL(llc_sap_find);
......
net/llc/llc_evnt.c deleted 100644 → 0
View file @ ae15ab84
/*
* llc_evnt.c - LLC station component event match functions
* Description :
* Functions in this module are implementation of station component events.
* Details of events can be found in IEEE-802.2 standard document.
* All functions have one station and one event as input argument. All of
* them return 0 On success and 1 otherwise.
*
* Copyright (c) 1997 by Procom Technology, Inc.
* 2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
*
* This program can be redistributed or modified under the terms of the
* GNU General Public License as published by the Free Software Foundation.
* This program is distributed without any warranty or implied warranty
* of merchantability or fitness for a particular purpose.
*
* See the GNU General Public License for more details.
*/
#include <net/sock.h>
#include <net/llc_if.h>
#include <net/llc_evnt.h>
#include <net/llc_pdu.h>
#include <net/llc_station.h>
int llc_stat_ev_enable_with_dup_addr_check(struct llc_station *station,
struct sk_buff *skb)
{
struct llc_station_state_ev *ev = llc_station_ev(skb);
return ev->type == LLC_STATION_EV_TYPE_SIMPLE &&
ev->prim_type ==
LLC_STATION_EV_ENABLE_WITH_DUP_ADDR_CHECK ? 0 : 1;
}
int llc_stat_ev_enable_without_dup_addr_check(struct llc_station *station,
struct sk_buff *skb)
{
struct llc_station_state_ev *ev = llc_station_ev(skb);
return ev->type == LLC_STATION_EV_TYPE_SIMPLE &&
ev->prim_type ==
LLC_STATION_EV_ENABLE_WITHOUT_DUP_ADDR_CHECK ? 0 : 1;
}
int llc_stat_ev_ack_tmr_exp_lt_retry_cnt_max_retry(struct llc_station *station,
struct sk_buff *skb)
{
struct llc_station_state_ev *ev = llc_station_ev(skb);
return ev->type == LLC_STATION_EV_TYPE_ACK_TMR &&
station->retry_count < station->maximum_retry ? 0 : 1;
}
int llc_stat_ev_ack_tmr_exp_eq_retry_cnt_max_retry(struct llc_station *station,
struct sk_buff *skb)
{
struct llc_station_state_ev *ev = llc_station_ev(skb);
return ev->type == LLC_STATION_EV_TYPE_ACK_TMR &&
station->retry_count == station->maximum_retry ? 0 : 1;
}
int llc_stat_ev_rx_null_dsap_xid_c(struct llc_station *station,
struct sk_buff *skb)
{
struct llc_station_state_ev *ev = llc_station_ev(skb);
struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
return ev->type == LLC_STATION_EV_TYPE_PDU &&
LLC_PDU_IS_CMD(pdu) && /* command PDU */
LLC_PDU_TYPE_IS_U(pdu) && /* U type PDU */
LLC_U_PDU_CMD(pdu) == LLC_1_PDU_CMD_XID &&
!pdu->dsap ? 0 : 1; /* NULL DSAP value */
}
int llc_stat_ev_rx_null_dsap_0_xid_r_xid_r_cnt_eq(struct llc_station *station,
struct sk_buff *skb)
{
struct llc_station_state_ev *ev = llc_station_ev(skb);
struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
return ev->type == LLC_STATION_EV_TYPE_PDU &&
LLC_PDU_IS_RSP(pdu) && /* response PDU */
LLC_PDU_TYPE_IS_U(pdu) && /* U type PDU */
LLC_U_PDU_RSP(pdu) == LLC_1_PDU_CMD_XID &&
!pdu->dsap && /* NULL DSAP value */
!station->xid_r_count ? 0 : 1;
}
int llc_stat_ev_rx_null_dsap_1_xid_r_xid_r_cnt_eq(struct llc_station *station,
struct sk_buff *skb)
{
struct llc_station_state_ev *ev = llc_station_ev(skb);
struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
return ev->type == LLC_STATION_EV_TYPE_PDU &&
LLC_PDU_IS_RSP(pdu) && /* response PDU */
LLC_PDU_TYPE_IS_U(pdu) && /* U type PDU */
LLC_U_PDU_RSP(pdu) == LLC_1_PDU_CMD_XID &&
!pdu->dsap && /* NULL DSAP value */
station->xid_r_count == 1 ? 0 : 1;
}
int llc_stat_ev_rx_null_dsap_test_c(struct llc_station *station,
struct sk_buff *skb)
{
struct llc_station_state_ev *ev = llc_station_ev(skb);
struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
return ev->type == LLC_STATION_EV_TYPE_PDU &&
LLC_PDU_IS_CMD(pdu) && /* command PDU */
LLC_PDU_TYPE_IS_U(pdu) && /* U type PDU */
LLC_U_PDU_CMD(pdu) == LLC_1_PDU_CMD_TEST &&
!pdu->dsap ? 0 : 1; /* NULL DSAP */
}
int llc_stat_ev_disable_req(struct llc_station *station, struct sk_buff *skb)
{
struct llc_station_state_ev *ev = llc_station_ev(skb);
return ev->type == LLC_STATION_EV_TYPE_PRIM &&
ev->prim == LLC_DISABLE_PRIM &&
ev->prim_type == LLC_PRIM_TYPE_REQ ? 0 : 1;
}
net/llc/llc_stat.c deleted 100644 → 0
View file @ ae15ab84
/*
* llc_stat.c - Implementation of LLC station component state machine
* transitions
* Copyright (c) 1997 by Procom Technology, Inc.
* 2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
*
* This program can be redistributed or modified under the terms of the
* GNU General Public License as published by the Free Software Foundation.
* This program is distributed without any warranty or implied warranty
* of merchantability or fitness for a particular purpose.
*
* See the GNU General Public License for more details.
*/
#include <linux/types.h>
#include <net/llc_if.h>
#include <net/llc_sap.h>
#include <net/llc_evnt.h>
#include <net/llc_actn.h>
#include <net/llc_stat.h>
/* COMMON STATION STATE transitions */
/* dummy last-transition indicator; common to all state transition groups
* last entry for this state
* all members are zeros, .bss zeroes it
*/
static struct llc_station_state_trans llc_stat_state_trans_end;
/* DOWN STATE transitions */
/* state transition for LLC_STATION_EV_ENABLE_WITH_DUP_ADDR_CHECK event */
static llc_station_action_t llc_stat_down_state_actions_1[] = {
[0] = llc_station_ac_start_ack_timer,
[1] = llc_station_ac_set_retry_cnt_0,
[2] = llc_station_ac_set_xid_r_cnt_0,
[3] = llc_station_ac_send_null_dsap_xid_c,
[4] = NULL,
};
static struct llc_station_state_trans llc_stat_down_state_trans_1 = {
.ev = llc_stat_ev_enable_with_dup_addr_check,
.next_state = LLC_STATION_STATE_DUP_ADDR_CHK,
.ev_actions = llc_stat_down_state_actions_1,
};
/* state transition for LLC_STATION_EV_ENABLE_WITHOUT_DUP_ADDR_CHECK event */
static llc_station_action_t llc_stat_down_state_actions_2[] = {
[0] = llc_station_ac_report_status, /* STATION UP */
[1] = NULL,
};
static struct llc_station_state_trans llc_stat_down_state_trans_2 = {
.ev = llc_stat_ev_enable_without_dup_addr_check,
.next_state = LLC_STATION_STATE_UP,
.ev_actions = llc_stat_down_state_actions_2,
};
/* array of pointers; one to each transition */
static struct llc_station_state_trans *llc_stat_dwn_state_trans[] = {
[0] = &llc_stat_down_state_trans_1,
[1] = &llc_stat_down_state_trans_2,
[2] = &llc_stat_state_trans_end,
};
/* UP STATE transitions */
/* state transition for LLC_STATION_EV_DISABLE_REQ event */
static llc_station_action_t llc_stat_up_state_actions_1[] = {
[0] = llc_station_ac_report_status, /* STATION DOWN */
[1] = NULL,
};
static struct llc_station_state_trans llc_stat_up_state_trans_1 = {
.ev = llc_stat_ev_disable_req,
.next_state = LLC_STATION_STATE_DOWN,
.ev_actions = llc_stat_up_state_actions_1,
};
/* state transition for LLC_STATION_EV_RX_NULL_DSAP_XID_C event */
static llc_station_action_t llc_stat_up_state_actions_2[] = {
[0] = llc_station_ac_send_xid_r,
[1] = NULL,
};
static struct llc_station_state_trans llc_stat_up_state_trans_2 = {
.ev = llc_stat_ev_rx_null_dsap_xid_c,
.next_state = LLC_STATION_STATE_UP,
.ev_actions = llc_stat_up_state_actions_2,
};
/* state transition for LLC_STATION_EV_RX_NULL_DSAP_TEST_C event */
static llc_station_action_t llc_stat_up_state_actions_3[] = {
[0] = llc_station_ac_send_test_r,
[1] = NULL,
};
static struct llc_station_state_trans llc_stat_up_state_trans_3 = {
.ev = llc_stat_ev_rx_null_dsap_test_c,
.next_state = LLC_STATION_STATE_UP,
.ev_actions = llc_stat_up_state_actions_3,
};
/* array of pointers; one to each transition */
static struct llc_station_state_trans *llc_stat_up_state_trans [] = {
[0] = &llc_stat_up_state_trans_1,
[1] = &llc_stat_up_state_trans_2,
[2] = &llc_stat_up_state_trans_3,
[3] = &llc_stat_state_trans_end,
};
/* DUP ADDR CHK STATE transitions */
/* state transition for LLC_STATION_EV_RX_NULL_DSAP_0_XID_R_XID_R_CNT_EQ
* event
*/
static llc_station_action_t llc_stat_dupaddr_state_actions_1[] = {
[0] = llc_station_ac_inc_xid_r_cnt_by_1,
[1] = NULL,
};
static struct llc_station_state_trans llc_stat_dupaddr_state_trans_1 = {
.ev = llc_stat_ev_rx_null_dsap_0_xid_r_xid_r_cnt_eq,
.next_state = LLC_STATION_STATE_DUP_ADDR_CHK,
.ev_actions = llc_stat_dupaddr_state_actions_1,
};
/* state transition for LLC_STATION_EV_RX_NULL_DSAP_1_XID_R_XID_R_CNT_EQ
* event
*/
static llc_station_action_t llc_stat_dupaddr_state_actions_2[] = {
[0] = llc_station_ac_report_status, /* DUPLICATE ADDRESS FOUND */
[1] = NULL,
};
static struct llc_station_state_trans llc_stat_dupaddr_state_trans_2 = {
.ev = llc_stat_ev_rx_null_dsap_1_xid_r_xid_r_cnt_eq,
.next_state = LLC_STATION_STATE_DOWN,
.ev_actions = llc_stat_dupaddr_state_actions_2,
};
/* state transition for LLC_STATION_EV_RX_NULL_DSAP_XID_C event */
static llc_station_action_t llc_stat_dupaddr_state_actions_3[] = {
[0] = llc_station_ac_send_xid_r,
[1] = NULL,
};
static struct llc_station_state_trans llc_stat_dupaddr_state_trans_3 = {
.ev = llc_stat_ev_rx_null_dsap_xid_c,
.next_state = LLC_STATION_STATE_DUP_ADDR_CHK,
.ev_actions = llc_stat_dupaddr_state_actions_3,
};
/* state transition for LLC_STATION_EV_ACK_TMR_EXP_LT_RETRY_CNT_MAX_RETRY
* event
*/
static llc_station_action_t llc_stat_dupaddr_state_actions_4[] = {
[0] = llc_station_ac_start_ack_timer,
[1] = llc_station_ac_inc_retry_cnt_by_1,
[2] = llc_station_ac_set_xid_r_cnt_0,
[3] = llc_station_ac_send_null_dsap_xid_c,
[4] = NULL,
};
static struct llc_station_state_trans llc_stat_dupaddr_state_trans_4 = {
.ev = llc_stat_ev_ack_tmr_exp_lt_retry_cnt_max_retry,
.next_state = LLC_STATION_STATE_DUP_ADDR_CHK,
.ev_actions = llc_stat_dupaddr_state_actions_4,
};
/* state transition for LLC_STATION_EV_ACK_TMR_EXP_EQ_RETRY_CNT_MAX_RETRY
* event
*/
static llc_station_action_t llc_stat_dupaddr_state_actions_5[] = {
[0] = llc_station_ac_report_status, /* STATION UP */
[1] = NULL,
};
static struct llc_station_state_trans llc_stat_dupaddr_state_trans_5 = {
.ev = llc_stat_ev_ack_tmr_exp_eq_retry_cnt_max_retry,
.next_state = LLC_STATION_STATE_UP,
.ev_actions = llc_stat_dupaddr_state_actions_5,
};
/* state transition for LLC_STATION_EV_DISABLE_REQ event */
static llc_station_action_t llc_stat_dupaddr_state_actions_6[] = {
[0] = llc_station_ac_report_status, /* STATION DOWN */
[1] = NULL,
};
static struct llc_station_state_trans llc_stat_dupaddr_state_trans_6 = {
.ev = llc_stat_ev_disable_req,
.next_state = LLC_STATION_STATE_DOWN,
.ev_actions = llc_stat_dupaddr_state_actions_6,
};
/* array of pointers; one to each transition */
static struct llc_station_state_trans *llc_stat_dupaddr_state_trans[] = {
[0] = &llc_stat_dupaddr_state_trans_6, /* Request */
[1] = &llc_stat_dupaddr_state_trans_4, /* Timer */
[2] = &llc_stat_dupaddr_state_trans_5,
[3] = &llc_stat_dupaddr_state_trans_1, /* Receive frame */
[4] = &llc_stat_dupaddr_state_trans_2,
[5] = &llc_stat_dupaddr_state_trans_3,
[6] = &llc_stat_state_trans_end,
};
struct llc_station_state llc_station_state_table[LLC_NBR_STATION_STATES] = {
[LLC_STATION_STATE_DOWN - 1] = {
.curr_state = LLC_STATION_STATE_DOWN,
.transitions = llc_stat_dwn_state_trans,
},
[LLC_STATION_STATE_DUP_ADDR_CHK - 1] = {
.curr_state = LLC_STATION_STATE_DUP_ADDR_CHK,
.transitions = llc_stat_dupaddr_state_trans,
},
[LLC_STATION_STATE_UP - 1] = {
.curr_state = LLC_STATION_STATE_UP,
.transitions = llc_stat_up_state_trans,
},
};
net/llc/llc_station.c
View file @ 630aee50
...@@ -18,44 +18,507 @@ ...@@ -18,44 +18,507 @@
#include <net/llc_sap.h> #include <net/llc_sap.h>
#include <net/llc_conn.h> #include <net/llc_conn.h>
#include <net/llc_station.h> #include <net/llc_station.h>
#include <net/llc_evnt.h>
#include <net/llc_actn.h>
#include <net/llc_stat.h>
#include <net/llc_c_ac.h> #include <net/llc_c_ac.h>
#include <net/llc_s_ac.h> #include <net/llc_s_ac.h>
#include <net/llc_c_ev.h> #include <net/llc_c_ev.h>
#include <net/llc_c_st.h> #include <net/llc_c_st.h>
#include <net/llc_s_ev.h> #include <net/llc_s_ev.h>
#include <net/llc_s_st.h> #include <net/llc_s_st.h>
#include <net/llc_proc.h> #include <net/llc_pdu.h>
/* Types of events (possible values in 'ev->type') */
#define LLC_STATION_EV_TYPE_SIMPLE 1
#define LLC_STATION_EV_TYPE_CONDITION 2
#define LLC_STATION_EV_TYPE_PRIM 3
#define LLC_STATION_EV_TYPE_PDU 4 /* command/response PDU */
#define LLC_STATION_EV_TYPE_ACK_TMR 5
#define LLC_STATION_EV_TYPE_RPT_STATUS 6
/* Events */
#define LLC_STATION_EV_ENABLE_WITH_DUP_ADDR_CHECK 1
#define LLC_STATION_EV_ENABLE_WITHOUT_DUP_ADDR_CHECK 2
#define LLC_STATION_EV_ACK_TMR_EXP_LT_RETRY_CNT_MAX_RETRY 3
#define LLC_STATION_EV_ACK_TMR_EXP_EQ_RETRY_CNT_MAX_RETRY 4
#define LLC_STATION_EV_RX_NULL_DSAP_XID_C 5
#define LLC_STATION_EV_RX_NULL_DSAP_0_XID_R_XID_R_CNT_EQ 6
#define LLC_STATION_EV_RX_NULL_DSAP_1_XID_R_XID_R_CNT_EQ 7
#define LLC_STATION_EV_RX_NULL_DSAP_TEST_C 8
#define LLC_STATION_EV_DISABLE_REQ 9
struct llc_station_state_ev {
u8 type;
u8 prim;
u8 prim_type;
u8 reason;
struct list_head node; /* node in station->ev_q.list */
};
static __inline__ struct llc_station_state_ev *
llc_station_ev(struct sk_buff *skb)
{
return (struct llc_station_state_ev *)skb->cb;
}
typedef int (*llc_station_ev_t)(struct sk_buff *skb);
#define LLC_STATION_STATE_DOWN 1 /* initial state */
#define LLC_STATION_STATE_DUP_ADDR_CHK 2
#define LLC_STATION_STATE_UP 3
#define LLC_NBR_STATION_STATES 3 /* size of state table */
typedef int (*llc_station_action_t)(struct sk_buff *skb);
/* Station component state table structure */
struct llc_station_state_trans {
llc_station_ev_t ev;
u8 next_state;
llc_station_action_t *ev_actions;
};
struct llc_station_state {
u8 curr_state;
struct llc_station_state_trans **transitions;
};
static struct llc_station llc_main_station; static struct llc_station llc_main_station;
static int llc_stat_ev_enable_with_dup_addr_check(struct sk_buff *skb)
{
struct llc_station_state_ev *ev = llc_station_ev(skb);
return ev->type == LLC_STATION_EV_TYPE_SIMPLE &&
ev->prim_type ==
LLC_STATION_EV_ENABLE_WITH_DUP_ADDR_CHECK ? 0 : 1;
}
static int llc_stat_ev_enable_without_dup_addr_check(struct sk_buff *skb)
{
struct llc_station_state_ev *ev = llc_station_ev(skb);
return ev->type == LLC_STATION_EV_TYPE_SIMPLE &&
ev->prim_type ==
LLC_STATION_EV_ENABLE_WITHOUT_DUP_ADDR_CHECK ? 0 : 1;
}
static int llc_stat_ev_ack_tmr_exp_lt_retry_cnt_max_retry(struct sk_buff *skb)
{
struct llc_station_state_ev *ev = llc_station_ev(skb);
return ev->type == LLC_STATION_EV_TYPE_ACK_TMR &&
llc_main_station.retry_count <
llc_main_station.maximum_retry ? 0 : 1;
}
static int llc_stat_ev_ack_tmr_exp_eq_retry_cnt_max_retry(struct sk_buff *skb)
{
struct llc_station_state_ev *ev = llc_station_ev(skb);
return ev->type == LLC_STATION_EV_TYPE_ACK_TMR &&
llc_main_station.retry_count ==
llc_main_station.maximum_retry ? 0 : 1;
}
static int llc_stat_ev_rx_null_dsap_xid_c(struct sk_buff *skb)
{
struct llc_station_state_ev *ev = llc_station_ev(skb);
struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
return ev->type == LLC_STATION_EV_TYPE_PDU &&
LLC_PDU_IS_CMD(pdu) && /* command PDU */
LLC_PDU_TYPE_IS_U(pdu) && /* U type PDU */
LLC_U_PDU_CMD(pdu) == LLC_1_PDU_CMD_XID &&
!pdu->dsap ? 0 : 1; /* NULL DSAP value */
}
static int llc_stat_ev_rx_null_dsap_0_xid_r_xid_r_cnt_eq(struct sk_buff *skb)
{
struct llc_station_state_ev *ev = llc_station_ev(skb);
struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
return ev->type == LLC_STATION_EV_TYPE_PDU &&
LLC_PDU_IS_RSP(pdu) && /* response PDU */
LLC_PDU_TYPE_IS_U(pdu) && /* U type PDU */
LLC_U_PDU_RSP(pdu) == LLC_1_PDU_CMD_XID &&
!pdu->dsap && /* NULL DSAP value */
!llc_main_station.xid_r_count ? 0 : 1;
}
static int llc_stat_ev_rx_null_dsap_1_xid_r_xid_r_cnt_eq(struct sk_buff *skb)
{
struct llc_station_state_ev *ev = llc_station_ev(skb);
struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
return ev->type == LLC_STATION_EV_TYPE_PDU &&
LLC_PDU_IS_RSP(pdu) && /* response PDU */
LLC_PDU_TYPE_IS_U(pdu) && /* U type PDU */
LLC_U_PDU_RSP(pdu) == LLC_1_PDU_CMD_XID &&
!pdu->dsap && /* NULL DSAP value */
llc_main_station.xid_r_count == 1 ? 0 : 1;
}
static int llc_stat_ev_rx_null_dsap_test_c(struct sk_buff *skb)
{
struct llc_station_state_ev *ev = llc_station_ev(skb);
struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
return ev->type == LLC_STATION_EV_TYPE_PDU &&
LLC_PDU_IS_CMD(pdu) && /* command PDU */
LLC_PDU_TYPE_IS_U(pdu) && /* U type PDU */
LLC_U_PDU_CMD(pdu) == LLC_1_PDU_CMD_TEST &&
!pdu->dsap ? 0 : 1; /* NULL DSAP */
}
static int llc_stat_ev_disable_req(struct sk_buff *skb)
{
struct llc_station_state_ev *ev = llc_station_ev(skb);
return ev->type == LLC_STATION_EV_TYPE_PRIM &&
ev->prim == LLC_DISABLE_PRIM &&
ev->prim_type == LLC_PRIM_TYPE_REQ ? 0 : 1;
}
/**
* llc_station_send_pdu - queues PDU to send
* @skb: Address of the PDU
*
* Queues a PDU to send to the MAC layer.
*/
static void llc_station_send_pdu(struct sk_buff *skb)
{
skb_queue_tail(&llc_main_station.mac_pdu_q, skb);
while ((skb = skb_dequeue(&llc_main_station.mac_pdu_q)) != NULL)
if (dev_queue_xmit(skb))
break;
}
static int llc_station_ac_start_ack_timer(struct sk_buff *skb)
{
mod_timer(&llc_main_station.ack_timer, jiffies + LLC_ACK_TIME * HZ);
return 0;
}
static int llc_station_ac_set_retry_cnt_0(struct sk_buff *skb)
{
llc_main_station.retry_count = 0;
return 0;
}
static int llc_station_ac_inc_retry_cnt_by_1(struct sk_buff *skb)
{
llc_main_station.retry_count++;
return 0;
}
static int llc_station_ac_set_xid_r_cnt_0(struct sk_buff *skb)
{
llc_main_station.xid_r_count = 0;
return 0;
}
static int llc_station_ac_inc_xid_r_cnt_by_1(struct sk_buff *skb)
{
llc_main_station.xid_r_count++;
return 0;
}
static int llc_station_ac_send_null_dsap_xid_c(struct sk_buff *skb)
{
int rc = 1;
struct sk_buff *nskb = llc_alloc_frame();
if (!nskb)
goto out;
llc_pdu_header_init(nskb, LLC_PDU_TYPE_U, 0, 0, LLC_PDU_CMD);
llc_pdu_init_as_xid_cmd(nskb, LLC_XID_NULL_CLASS_2, 127);
rc = llc_mac_hdr_init(nskb, llc_station_mac_sa, llc_station_mac_sa);
if (rc)
goto free;
llc_station_send_pdu(nskb);
out:
return rc;
free:
kfree_skb(skb);
goto out;
}
static int llc_station_ac_send_xid_r(struct sk_buff *skb)
{
u8 mac_da[ETH_ALEN], dsap;
int rc = 1;
struct sk_buff* nskb = llc_alloc_frame();
if (!nskb)
goto out;
rc = 0;
nskb->dev = skb->dev;
llc_pdu_decode_sa(skb, mac_da);
llc_pdu_decode_ssap(skb, &dsap);
llc_pdu_header_init(nskb, LLC_PDU_TYPE_U, 0, dsap, LLC_PDU_RSP);
llc_pdu_init_as_xid_rsp(nskb, LLC_XID_NULL_CLASS_2, 127);
rc = llc_mac_hdr_init(nskb, llc_station_mac_sa, mac_da);
if (rc)
goto free;
llc_station_send_pdu(nskb);
out:
return rc;
free:
kfree_skb(skb);
goto out;
}
static int llc_station_ac_send_test_r(struct sk_buff *skb)
{
u8 mac_da[ETH_ALEN], dsap;
int rc = 1;
struct sk_buff *nskb = llc_alloc_frame();
if (!nskb)
goto out;
rc = 0;
nskb->dev = skb->dev;
llc_pdu_decode_sa(skb, mac_da);
llc_pdu_decode_ssap(skb, &dsap);
llc_pdu_header_init(nskb, LLC_PDU_TYPE_U, 0, dsap, LLC_PDU_RSP);
llc_pdu_init_as_test_rsp(nskb, skb);
rc = llc_mac_hdr_init(nskb, llc_station_mac_sa, mac_da);
if (rc)
goto free;
llc_station_send_pdu(nskb);
out:
return rc;
free:
kfree_skb(skb);
goto out;
}
static int llc_station_ac_report_status(struct sk_buff *skb)
{
return 0;
}
/* COMMON STATION STATE transitions */
/* dummy last-transition indicator; common to all state transition groups
* last entry for this state
* all members are zeros, .bss zeroes it
*/
static struct llc_station_state_trans llc_stat_state_trans_end;
/* DOWN STATE transitions */
/* state transition for LLC_STATION_EV_ENABLE_WITH_DUP_ADDR_CHECK event */
static llc_station_action_t llc_stat_down_state_actions_1[] = {
[0] = llc_station_ac_start_ack_timer,
[1] = llc_station_ac_set_retry_cnt_0,
[2] = llc_station_ac_set_xid_r_cnt_0,
[3] = llc_station_ac_send_null_dsap_xid_c,
[4] = NULL,
};
static struct llc_station_state_trans llc_stat_down_state_trans_1 = {
.ev = llc_stat_ev_enable_with_dup_addr_check,
.next_state = LLC_STATION_STATE_DUP_ADDR_CHK,
.ev_actions = llc_stat_down_state_actions_1,
};
/* state transition for LLC_STATION_EV_ENABLE_WITHOUT_DUP_ADDR_CHECK event */
static llc_station_action_t llc_stat_down_state_actions_2[] = {
[0] = llc_station_ac_report_status, /* STATION UP */
[1] = NULL,
};
static struct llc_station_state_trans llc_stat_down_state_trans_2 = {
.ev = llc_stat_ev_enable_without_dup_addr_check,
.next_state = LLC_STATION_STATE_UP,
.ev_actions = llc_stat_down_state_actions_2,
};
/* array of pointers; one to each transition */
static struct llc_station_state_trans *llc_stat_dwn_state_trans[] = {
[0] = &llc_stat_down_state_trans_1,
[1] = &llc_stat_down_state_trans_2,
[2] = &llc_stat_state_trans_end,
};
/* UP STATE transitions */
/* state transition for LLC_STATION_EV_DISABLE_REQ event */
static llc_station_action_t llc_stat_up_state_actions_1[] = {
[0] = llc_station_ac_report_status, /* STATION DOWN */
[1] = NULL,
};
static struct llc_station_state_trans llc_stat_up_state_trans_1 = {
.ev = llc_stat_ev_disable_req,
.next_state = LLC_STATION_STATE_DOWN,
.ev_actions = llc_stat_up_state_actions_1,
};
/* state transition for LLC_STATION_EV_RX_NULL_DSAP_XID_C event */
static llc_station_action_t llc_stat_up_state_actions_2[] = {
[0] = llc_station_ac_send_xid_r,
[1] = NULL,
};
static struct llc_station_state_trans llc_stat_up_state_trans_2 = {
.ev = llc_stat_ev_rx_null_dsap_xid_c,
.next_state = LLC_STATION_STATE_UP,
.ev_actions = llc_stat_up_state_actions_2,
};
/* state transition for LLC_STATION_EV_RX_NULL_DSAP_TEST_C event */
static llc_station_action_t llc_stat_up_state_actions_3[] = {
[0] = llc_station_ac_send_test_r,
[1] = NULL,
};
static struct llc_station_state_trans llc_stat_up_state_trans_3 = {
.ev = llc_stat_ev_rx_null_dsap_test_c,
.next_state = LLC_STATION_STATE_UP,
.ev_actions = llc_stat_up_state_actions_3,
};
/* array of pointers; one to each transition */
static struct llc_station_state_trans *llc_stat_up_state_trans [] = {
[0] = &llc_stat_up_state_trans_1,
[1] = &llc_stat_up_state_trans_2,
[2] = &llc_stat_up_state_trans_3,
[3] = &llc_stat_state_trans_end,
};
/* DUP ADDR CHK STATE transitions */
/* state transition for LLC_STATION_EV_RX_NULL_DSAP_0_XID_R_XID_R_CNT_EQ
* event
*/
static llc_station_action_t llc_stat_dupaddr_state_actions_1[] = {
[0] = llc_station_ac_inc_xid_r_cnt_by_1,
[1] = NULL,
};
static struct llc_station_state_trans llc_stat_dupaddr_state_trans_1 = {
.ev = llc_stat_ev_rx_null_dsap_0_xid_r_xid_r_cnt_eq,
.next_state = LLC_STATION_STATE_DUP_ADDR_CHK,
.ev_actions = llc_stat_dupaddr_state_actions_1,
};
/* state transition for LLC_STATION_EV_RX_NULL_DSAP_1_XID_R_XID_R_CNT_EQ
* event
*/
static llc_station_action_t llc_stat_dupaddr_state_actions_2[] = {
[0] = llc_station_ac_report_status, /* DUPLICATE ADDRESS FOUND */
[1] = NULL,
};
static struct llc_station_state_trans llc_stat_dupaddr_state_trans_2 = {
.ev = llc_stat_ev_rx_null_dsap_1_xid_r_xid_r_cnt_eq,
.next_state = LLC_STATION_STATE_DOWN,
.ev_actions = llc_stat_dupaddr_state_actions_2,
};
/* state transition for LLC_STATION_EV_RX_NULL_DSAP_XID_C event */
static llc_station_action_t llc_stat_dupaddr_state_actions_3[] = {
[0] = llc_station_ac_send_xid_r,
[1] = NULL,
};
static struct llc_station_state_trans llc_stat_dupaddr_state_trans_3 = {
.ev = llc_stat_ev_rx_null_dsap_xid_c,
.next_state = LLC_STATION_STATE_DUP_ADDR_CHK,
.ev_actions = llc_stat_dupaddr_state_actions_3,
};
/* state transition for LLC_STATION_EV_ACK_TMR_EXP_LT_RETRY_CNT_MAX_RETRY
* event
*/
static llc_station_action_t llc_stat_dupaddr_state_actions_4[] = {
[0] = llc_station_ac_start_ack_timer,
[1] = llc_station_ac_inc_retry_cnt_by_1,
[2] = llc_station_ac_set_xid_r_cnt_0,
[3] = llc_station_ac_send_null_dsap_xid_c,
[4] = NULL,
};
static struct llc_station_state_trans llc_stat_dupaddr_state_trans_4 = {
.ev = llc_stat_ev_ack_tmr_exp_lt_retry_cnt_max_retry,
.next_state = LLC_STATION_STATE_DUP_ADDR_CHK,
.ev_actions = llc_stat_dupaddr_state_actions_4,
};
/* state transition for LLC_STATION_EV_ACK_TMR_EXP_EQ_RETRY_CNT_MAX_RETRY
* event
*/
static llc_station_action_t llc_stat_dupaddr_state_actions_5[] = {
[0] = llc_station_ac_report_status, /* STATION UP */
[1] = NULL,
};
static struct llc_station_state_trans llc_stat_dupaddr_state_trans_5 = {
.ev = llc_stat_ev_ack_tmr_exp_eq_retry_cnt_max_retry,
.next_state = LLC_STATION_STATE_UP,
.ev_actions = llc_stat_dupaddr_state_actions_5,
};
/* state transition for LLC_STATION_EV_DISABLE_REQ event */
static llc_station_action_t llc_stat_dupaddr_state_actions_6[] = {
[0] = llc_station_ac_report_status, /* STATION DOWN */
[1] = NULL,
};
static struct llc_station_state_trans llc_stat_dupaddr_state_trans_6 = {
.ev = llc_stat_ev_disable_req,
.next_state = LLC_STATION_STATE_DOWN,
.ev_actions = llc_stat_dupaddr_state_actions_6,
};
/* array of pointers; one to each transition */
static struct llc_station_state_trans *llc_stat_dupaddr_state_trans[] = {
[0] = &llc_stat_dupaddr_state_trans_6, /* Request */
[1] = &llc_stat_dupaddr_state_trans_4, /* Timer */
[2] = &llc_stat_dupaddr_state_trans_5,
[3] = &llc_stat_dupaddr_state_trans_1, /* Receive frame */
[4] = &llc_stat_dupaddr_state_trans_2,
[5] = &llc_stat_dupaddr_state_trans_3,
[6] = &llc_stat_state_trans_end,
};
static struct llc_station_state
llc_station_state_table[LLC_NBR_STATION_STATES] = {
[LLC_STATION_STATE_DOWN - 1] = {
.curr_state = LLC_STATION_STATE_DOWN,
.transitions = llc_stat_dwn_state_trans,
},
[LLC_STATION_STATE_DUP_ADDR_CHK - 1] = {
.curr_state = LLC_STATION_STATE_DUP_ADDR_CHK,
.transitions = llc_stat_dupaddr_state_trans,
},
[LLC_STATION_STATE_UP - 1] = {
.curr_state = LLC_STATION_STATE_UP,
.transitions = llc_stat_up_state_trans,
},
};
/** /**
* llc_exec_station_trans_actions - executes actions for transition * llc_exec_station_trans_actions - executes actions for transition
* @station: Address of the station
* @trans: Address of the transition * @trans: Address of the transition
* @skb: Address of the event that caused the transition * @skb: Address of the event that caused the transition
* *
* Executes actions of a transition of the station state machine. Returns * Executes actions of a transition of the station state machine. Returns
* 0 if all actions complete successfully, nonzero otherwise. * 0 if all actions complete successfully, nonzero otherwise.
*/ */
static u16 llc_exec_station_trans_actions(struct llc_station *station, static u16 llc_exec_station_trans_actions(struct llc_station_state_trans *trans,
struct llc_station_state_trans *trans,
struct sk_buff *skb) struct sk_buff *skb)
{ {
u16 rc = 0; u16 rc = 0;
llc_station_action_t *next_action = trans->ev_actions; llc_station_action_t *next_action = trans->ev_actions;
for (; next_action && *next_action; next_action++) for (; next_action && *next_action; next_action++)
if ((*next_action)(station, skb)) if ((*next_action)(skb))
rc = 1; rc = 1;
return rc; return rc;
} }
/** /**
* llc_find_station_trans - finds transition for this event * llc_find_station_trans - finds transition for this event
* @station: Address of the station
* @skb: Address of the event * @skb: Address of the event
* *
* Search thru events of the current state of the station until list * Search thru events of the current state of the station until list
...@@ -63,17 +526,16 @@ static u16 llc_exec_station_trans_actions(struct llc_station *station, ...@@ -63,17 +526,16 @@ static u16 llc_exec_station_trans_actions(struct llc_station *station,
* state. Returns the address of the transition if cound, %NULL otherwise. * state. Returns the address of the transition if cound, %NULL otherwise.
*/ */
static struct llc_station_state_trans * static struct llc_station_state_trans *
llc_find_station_trans(struct llc_station *station, llc_find_station_trans(struct sk_buff *skb)
struct sk_buff *skb)
{ {
int i = 0; int i = 0;
struct llc_station_state_trans *rc = NULL; struct llc_station_state_trans *rc = NULL;
struct llc_station_state_trans **next_trans; struct llc_station_state_trans **next_trans;
struct llc_station_state *curr_state = struct llc_station_state *curr_state =
&llc_station_state_table[station->state - 1]; &llc_station_state_table[llc_main_station.state - 1];
for (next_trans = curr_state->transitions; next_trans[i]->ev; i++) for (next_trans = curr_state->transitions; next_trans[i]->ev; i++)
if (!next_trans[i]->ev(station, skb)) { if (!next_trans[i]->ev(skb)) {
rc = next_trans[i]; rc = next_trans[i];
break; break;
} }
...@@ -82,13 +544,11 @@ static struct llc_station_state_trans * ...@@ -82,13 +544,11 @@ static struct llc_station_state_trans *
/** /**
* llc_station_free_ev - frees an event * llc_station_free_ev - frees an event
* @station: Address of the station
* @skb: Address of the event * @skb: Address of the event
* *
* Frees an event. * Frees an event.
*/ */
static void llc_station_free_ev(struct llc_station *station, static void llc_station_free_ev(struct sk_buff *skb)
struct sk_buff *skb)
{ {
struct llc_station_state_ev *ev = llc_station_ev(skb); struct llc_station_state_ev *ev = llc_station_ev(skb);
...@@ -98,45 +558,42 @@ static void llc_station_free_ev(struct llc_station *station, ...@@ -98,45 +558,42 @@ static void llc_station_free_ev(struct llc_station *station,
/** /**
* llc_station_next_state - processes event and goes to the next state * llc_station_next_state - processes event and goes to the next state
* @station: Address of the station
* @skb: Address of the event * @skb: Address of the event
* *
* Processes an event, executes any transitions related to that event and * Processes an event, executes any transitions related to that event and
* updates the state of the station. * updates the state of the station.
*/ */
static u16 llc_station_next_state(struct llc_station *station, static u16 llc_station_next_state(struct sk_buff *skb)
struct sk_buff *skb)
{ {
u16 rc = 1; u16 rc = 1;
struct llc_station_state_trans *trans; struct llc_station_state_trans *trans;
if (station->state > LLC_NBR_STATION_STATES) if (llc_main_station.state > LLC_NBR_STATION_STATES)
goto out; goto out;
trans = llc_find_station_trans(station, skb); trans = llc_find_station_trans(skb);
if (trans) { if (trans) {
/* got the state to which we next transition; perform the /* got the state to which we next transition; perform the
* actions associated with this transition before actually * actions associated with this transition before actually
* transitioning to the next state * transitioning to the next state
*/ */
rc = llc_exec_station_trans_actions(station, trans, skb); rc = llc_exec_station_trans_actions(trans, skb);
if (!rc) if (!rc)
/* transition station to next state if all actions /* transition station to next state if all actions
* execute successfully; done; wait for next event * execute successfully; done; wait for next event
*/ */
station->state = trans->next_state; llc_main_station.state = trans->next_state;
} else } else
/* event not recognized in current state; re-queue it for /* event not recognized in current state; re-queue it for
* processing again at a later time; return failure * processing again at a later time; return failure
*/ */
rc = 0; rc = 0;
out: out:
llc_station_free_ev(station, skb); llc_station_free_ev(skb);
return rc; return rc;
} }
/** /**
* llc_station_service_events - service events in the queue * llc_station_service_events - service events in the queue
* @station: Address of the station
* *
* Get an event from the station event queue (if any); attempt to service * Get an event from the station event queue (if any); attempt to service
* the event; if event serviced, get the next event (if any) on the event * the event; if event serviced, get the next event (if any) on the event
...@@ -144,59 +601,41 @@ static u16 llc_station_next_state(struct llc_station *station, ...@@ -144,59 +601,41 @@ static u16 llc_station_next_state(struct llc_station *station,
* attempt to service the next event; when serviced all events in queue, * attempt to service the next event; when serviced all events in queue,
* finished; if don't transition to different state, just service all * finished; if don't transition to different state, just service all
* events once; if transition to new state, service all events again. * events once; if transition to new state, service all events again.
* Caller must hold station->ev_q.lock. * Caller must hold llc_main_station.ev_q.lock.
*/ */
static void llc_station_service_events(struct llc_station *station) static void llc_station_service_events(void)
{ {
struct sk_buff *skb; struct sk_buff *skb;
while ((skb = skb_dequeue(&station->ev_q.list)) != NULL) while ((skb = skb_dequeue(&llc_main_station.ev_q.list)) != NULL)
llc_station_next_state(station, skb); llc_station_next_state(skb);
} }
/** /**
* llc_station_state_process: queue event and try to process queue. * llc_station_state_process: queue event and try to process queue.
* @station: Address of the station
* @skb: Address of the event * @skb: Address of the event
* *
* Queues an event (on the station event queue) for handling by the * Queues an event (on the station event queue) for handling by the
* station state machine and attempts to process any queued-up events. * station state machine and attempts to process any queued-up events.
*/ */
void llc_station_state_process(struct llc_station *station, struct sk_buff *skb) void llc_station_state_process(struct sk_buff *skb)
{ {
spin_lock_bh(&station->ev_q.lock); spin_lock_bh(&llc_main_station.ev_q.lock);
skb_queue_tail(&station->ev_q.list, skb); skb_queue_tail(&llc_main_station.ev_q.list, skb);
llc_station_service_events(station); llc_station_service_events();
spin_unlock_bh(&station->ev_q.lock); spin_unlock_bh(&llc_main_station.ev_q.lock);
} }
/** static void llc_station_ack_tmr_cb(unsigned long timeout_data)
* llc_station_send_pdus - tries to send queued PDUs
* @station: Address of the station
*
* Tries to send any PDUs queued in the station mac_pdu_q to the MAC
* layer.
*/
static void llc_station_send_pdus(struct llc_station *station)
{ {
struct sk_buff *skb; struct sk_buff *skb = alloc_skb(0, GFP_ATOMIC);
while ((skb = skb_dequeue(&station->mac_pdu_q)) != NULL) if (skb) {
if (dev_queue_xmit(skb)) struct llc_station_state_ev *ev = llc_station_ev(skb);
break;
}
/** ev->type = LLC_STATION_EV_TYPE_ACK_TMR;
* llc_station_send_pdu - queues PDU to send llc_station_state_process(skb);
* @station: Address of the station }
* @skb: Address of the PDU
*
* Queues a PDU to send to the MAC layer.
*/
void llc_station_send_pdu(struct llc_station *station, struct sk_buff *skb)
{
skb_queue_tail(&station->mac_pdu_q, skb);
llc_station_send_pdus(station);
} }
/* /*
...@@ -211,7 +650,7 @@ static void llc_station_rcv(struct sk_buff *skb) ...@@ -211,7 +650,7 @@ static void llc_station_rcv(struct sk_buff *skb)
ev->type = LLC_STATION_EV_TYPE_PDU; ev->type = LLC_STATION_EV_TYPE_PDU;
ev->reason = 0; ev->reason = 0;
llc_station_state_process(&llc_main_station, skb); llc_station_state_process(skb);
} }
int __init llc_station_init(void) int __init llc_station_init(void)
...@@ -239,7 +678,7 @@ int __init llc_station_init(void) ...@@ -239,7 +678,7 @@ int __init llc_station_init(void)
llc_main_station.state = LLC_STATION_STATE_DOWN; llc_main_station.state = LLC_STATION_STATE_DOWN;
ev->type = LLC_STATION_EV_TYPE_SIMPLE; ev->type = LLC_STATION_EV_TYPE_SIMPLE;
ev->prim_type = LLC_STATION_EV_ENABLE_WITHOUT_DUP_ADDR_CHECK; ev->prim_type = LLC_STATION_EV_ENABLE_WITHOUT_DUP_ADDR_CHECK;
rc = llc_station_next_state(&llc_main_station, skb); rc = llc_station_next_state(skb);
out: out:
return rc; return rc;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7