patch-2.2.15 linux/net/irda/irlmp_event.c
Next file: linux/net/irda/irlmp_frame.c
Previous file: linux/net/irda/irlmp.c
Back to the patch index
Back to the overall index
- Lines: 894
- Date:
Fri Apr 21 12:47:16 2000
- Orig file:
v2.2.14/net/irda/irlmp_event.c
- Orig date:
Sat Aug 14 02:26:03 1999
diff -u --new-file --recursive --exclude-from ../../exclude v2.2.14/net/irda/irlmp_event.c linux/net/irda/irlmp_event.c
@@ -6,10 +6,10 @@
* Status: Experimental.
* Author: Dag Brattli <dagb@cs.uit.no>
* Created at: Mon Aug 4 20:40:53 1997
- * Modified at: Fri Apr 23 08:57:23 1999
+ * Modified at: Sun Jan 9 07:45:06 2000
* Modified by: Dag Brattli <dagb@cs.uit.no>
*
- * Copyright (c) 1998 Dag Brattli <dagb@cs.uit.no>,
+ * Copyright (c) 1998-2000 Dag Brattli <dagb@cs.uit.no>,
* All Rights Reserved.
*
* This program is free software; you can redistribute it and/or
@@ -75,35 +75,35 @@
};
/* LAP Connection control proto declarations */
-static void irlmp_state_standby ( struct lap_cb *, IRLMP_EVENT,
- struct sk_buff *);
-static void irlmp_state_u_connect( struct lap_cb *, IRLMP_EVENT,
- struct sk_buff *);
-static void irlmp_state_active ( struct lap_cb *, IRLMP_EVENT,
- struct sk_buff *);
+static void irlmp_state_standby (struct lap_cb *, IRLMP_EVENT,
+ struct sk_buff *);
+static void irlmp_state_u_connect(struct lap_cb *, IRLMP_EVENT,
+ struct sk_buff *);
+static void irlmp_state_active (struct lap_cb *, IRLMP_EVENT,
+ struct sk_buff *);
/* LSAP Connection control proto declarations */
-static void irlmp_state_disconnected( struct lsap_cb *, IRLMP_EVENT,
- struct sk_buff *);
-static void irlmp_state_connect ( struct lsap_cb *, IRLMP_EVENT,
- struct sk_buff *);
-static void irlmp_state_connect_pend( struct lsap_cb *, IRLMP_EVENT,
- struct sk_buff *);
-static void irlmp_state_dtr ( struct lsap_cb *, IRLMP_EVENT,
- struct sk_buff *);
-static void irlmp_state_setup ( struct lsap_cb *, IRLMP_EVENT,
- struct sk_buff *);
-static void irlmp_state_setup_pend ( struct lsap_cb *, IRLMP_EVENT,
- struct sk_buff *);
+static int irlmp_state_disconnected(struct lsap_cb *, IRLMP_EVENT,
+ struct sk_buff *);
+static int irlmp_state_connect (struct lsap_cb *, IRLMP_EVENT,
+ struct sk_buff *);
+static int irlmp_state_connect_pend(struct lsap_cb *, IRLMP_EVENT,
+ struct sk_buff *);
+static int irlmp_state_dtr (struct lsap_cb *, IRLMP_EVENT,
+ struct sk_buff *);
+static int irlmp_state_setup (struct lsap_cb *, IRLMP_EVENT,
+ struct sk_buff *);
+static int irlmp_state_setup_pend (struct lsap_cb *, IRLMP_EVENT,
+ struct sk_buff *);
-static void (*lap_state[]) ( struct lap_cb *, IRLMP_EVENT, struct sk_buff *) =
+static void (*lap_state[]) (struct lap_cb *, IRLMP_EVENT, struct sk_buff *) =
{
irlmp_state_standby,
irlmp_state_u_connect,
irlmp_state_active,
};
-static void (*lsap_state[])( struct lsap_cb *, IRLMP_EVENT, struct sk_buff *) =
+static int (*lsap_state[])( struct lsap_cb *, IRLMP_EVENT, struct sk_buff *) =
{
irlmp_state_disconnected,
irlmp_state_connect,
@@ -114,16 +114,16 @@
};
/* Do connection control events */
-void irlmp_do_lsap_event(struct lsap_cb *self, IRLMP_EVENT event,
- struct sk_buff *skb)
+int irlmp_do_lsap_event(struct lsap_cb *self, IRLMP_EVENT event,
+ struct sk_buff *skb)
{
- ASSERT(self != NULL, return;);
- ASSERT(self->magic == LMP_LSAP_MAGIC, return;);
+ ASSERT(self != NULL, return -1;);
+ ASSERT(self->magic == LMP_LSAP_MAGIC, return -1;);
- DEBUG(4, __FUNCTION__ "(), EVENT = %s, STATE = %s\n",
- irlmp_event[ event], irlmp_state[ self->lsap_state]);
+ IRDA_DEBUG(4, __FUNCTION__ "(), EVENT = %s, STATE = %s\n",
+ irlmp_event[event], irlmp_state[ self->lsap_state]);
- (*lsap_state[self->lsap_state]) (self, event, skb);
+ return (*lsap_state[self->lsap_state]) (self, event, skb);
}
/*
@@ -138,29 +138,29 @@
ASSERT(self != NULL, return;);
ASSERT(self->magic == LMP_LAP_MAGIC, return;);
- DEBUG(4, __FUNCTION__ "(), EVENT = %s, STATE = %s\n",
- irlmp_event[event],
- irlmp_state[self->lap_state]);
+ IRDA_DEBUG(4, __FUNCTION__ "(), EVENT = %s, STATE = %s\n",
+ irlmp_event[event],
+ irlmp_state[self->lap_state]);
(*lap_state[self->lap_state]) (self, event, skb);
}
-void irlmp_discovery_timer_expired( unsigned long data)
+void irlmp_discovery_timer_expired(void *data)
{
- DEBUG(4, "IrLMP, discovery timer expired!\n");
+ IRDA_DEBUG(4, __FUNCTION__ "()\n");
if (sysctl_discovery)
irlmp_do_discovery(sysctl_discovery_slots);
/* Restart timer */
- irlmp_start_discovery_timer(irlmp, 300);
+ irlmp_start_discovery_timer(irlmp, sysctl_discovery_timeout * HZ);
}
-void irlmp_watchdog_timer_expired( unsigned long data)
+void irlmp_watchdog_timer_expired(void *data)
{
- struct lsap_cb *self = ( struct lsap_cb *) data;
+ struct lsap_cb *self = (struct lsap_cb *) data;
- DEBUG(2, __FUNCTION__ "()\n");
+ IRDA_DEBUG(2, __FUNCTION__ "()\n");
ASSERT(self != NULL, return;);
ASSERT(self->magic == LMP_LSAP_MAGIC, return;);
@@ -168,11 +168,11 @@
irlmp_do_lsap_event(self, LM_WATCHDOG_TIMEOUT, NULL);
}
-void irlmp_idle_timer_expired(unsigned long data)
+void irlmp_idle_timer_expired(void *data)
{
struct lap_cb *self = (struct lap_cb *) data;
- DEBUG(2, __FUNCTION__ "()\n");
+ IRDA_DEBUG(2, __FUNCTION__ "()\n");
ASSERT(self != NULL, return;);
ASSERT(self->magic == LMP_LAP_MAGIC, return;);
@@ -195,10 +195,10 @@
static void irlmp_state_standby(struct lap_cb *self, IRLMP_EVENT event,
struct sk_buff *skb)
{
- DEBUG( 4, __FUNCTION__ "()\n");
- ASSERT( self->irlap != NULL, return;);
+ IRDA_DEBUG(4, __FUNCTION__ "()\n");
+ ASSERT(self->irlap != NULL, return;);
- switch( event) {
+ switch (event) {
case LM_LAP_DISCOVERY_REQUEST:
/* irlmp_next_station_state( LMP_DISCOVER); */
@@ -213,27 +213,31 @@
* think that the link is free since IrLMP may then start
* discovery before the connection is properly set up. DB.
*/
- irlmp_next_lap_state( self, LAP_ACTIVE);
+ irlmp_next_lap_state(self, LAP_ACTIVE);
/* Just accept connection TODO, this should be fixed */
- irlap_connect_response( self->irlap, skb);
+ irlap_connect_response(self->irlap, skb);
break;
case LM_LAP_CONNECT_REQUEST:
- DEBUG(4, __FUNCTION__ "() LS_CONNECT_REQUEST\n");
+ IRDA_DEBUG(4, __FUNCTION__ "() LS_CONNECT_REQUEST\n");
+
+ irlmp_next_lap_state(self, LAP_U_CONNECT);
+ self->refcount++;
/* FIXME: need to set users requested QoS */
irlap_connect_request(self->irlap, self->daddr, NULL, 0);
-
- irlmp_next_lap_state( self, LAP_U_CONNECT);
break;
case LM_LAP_DISCONNECT_INDICATION:
- DEBUG( 4, __FUNCTION__
- "(), Error LM_LAP_DISCONNECT_INDICATION\n");
+ IRDA_DEBUG(4, __FUNCTION__
+ "(), Error LM_LAP_DISCONNECT_INDICATION\n");
- irlmp_next_lap_state( self, LAP_STANDBY);
+ irlmp_next_lap_state(self, LAP_STANDBY);
break;
default:
- DEBUG(4, __FUNCTION__ "(), Unknown event\n");
+ IRDA_DEBUG(0, __FUNCTION__ "(), Unknown event %s\n",
+ irlmp_event[event]);
+ if (skb)
+ dev_kfree_skb(skb);
break;
}
}
@@ -245,55 +249,75 @@
* since the IrLAP connection does not exist, we must first start an
* IrLAP connection. We are now waiting response from IrLAP.
* */
-static void irlmp_state_u_connect( struct lap_cb *self, IRLMP_EVENT event,
- struct sk_buff *skb)
+static void irlmp_state_u_connect(struct lap_cb *self, IRLMP_EVENT event,
+ struct sk_buff *skb)
{
struct lsap_cb *lsap;
struct lsap_cb *lsap_current;
- DEBUG(2, __FUNCTION__ "(), event=%s\n", irlmp_event[ event]);
+ IRDA_DEBUG(2, __FUNCTION__ "(), event=%s\n", irlmp_event[event]);
- switch( event) {
+ switch (event) {
+ case LM_LAP_CONNECT_INDICATION:
+ /* It's important to switch state first, to avoid IrLMP to
+ * think that the link is free since IrLMP may then start
+ * discovery before the connection is properly set up. DB.
+ */
+ irlmp_next_lap_state(self, LAP_ACTIVE);
+
+ /* Just accept connection TODO, this should be fixed */
+ irlap_connect_response(self->irlap, skb);
+
+ lsap = (struct lsap_cb *) hashbin_get_first(self->lsaps);
+ while (lsap != NULL) {
+ irlmp_do_lsap_event(lsap, LM_LAP_CONNECT_CONFIRM, NULL);
+ lsap = (struct lsap_cb*) hashbin_get_next(self->lsaps);
+ }
+ break;
+ case LM_LAP_CONNECT_REQUEST:
+ /* Already trying to connect */
+ self->refcount++;
+ break;
case LM_LAP_CONNECT_CONFIRM:
/* For all lsap_ce E Associated do LS_Connect_confirm */
- irlmp_next_lap_state( self, LAP_ACTIVE);
+ irlmp_next_lap_state(self, LAP_ACTIVE);
- lsap = ( struct lsap_cb *) hashbin_get_first( self->lsaps);
- while ( lsap != NULL) {
- irlmp_do_lsap_event(lsap, LM_LAP_CONNECT_CONFIRM, skb);
+ lsap = (struct lsap_cb *) hashbin_get_first(self->lsaps);
+ while (lsap != NULL) {
+ irlmp_do_lsap_event(lsap, LM_LAP_CONNECT_CONFIRM, NULL);
lsap = (struct lsap_cb*) hashbin_get_next(self->lsaps);
- }
+ }
break;
case LM_LAP_DISCONNECT_INDICATION:
- DEBUG(2, __FUNCTION__ "(), IRLAP_DISCONNECT_INDICATION\n");
-
- irlmp_next_lap_state( self, LAP_STANDBY);
+ irlmp_next_lap_state(self, LAP_STANDBY);
+ self->refcount = 0;
/* Send disconnect event to all LSAPs using this link */
-
- lsap = ( struct lsap_cb *) hashbin_get_first( self->lsaps);
- while ( lsap != NULL ) {
- ASSERT( lsap->magic == LMP_LSAP_MAGIC, return;);
+ lsap = (struct lsap_cb *) hashbin_get_first( self->lsaps);
+ while (lsap != NULL ) {
+ ASSERT(lsap->magic == LMP_LSAP_MAGIC, return;);
lsap_current = lsap;
/* Be sure to stay one item ahead */
- lsap = ( struct lsap_cb *) hashbin_get_next( self->lsaps);
- irlmp_do_lsap_event( lsap_current,
- LM_LAP_DISCONNECT_INDICATION,
- NULL);
+ lsap = (struct lsap_cb *) hashbin_get_next(self->lsaps);
+ irlmp_do_lsap_event(lsap_current,
+ LM_LAP_DISCONNECT_INDICATION,
+ NULL);
}
break;
case LM_LAP_DISCONNECT_REQUEST:
- DEBUG( 4, __FUNCTION__ "(), LM_LAP_DISCONNECT_REQUEST\n");
+ IRDA_DEBUG(4, __FUNCTION__ "(), LM_LAP_DISCONNECT_REQUEST\n");
- irlmp_next_lap_state( self, LAP_STANDBY);
-
- /* FIXME */
-/* irlap_disconnect_request( self->irlap); */
+ self->refcount--;
+ if (self->refcount == 0)
+ irlmp_next_lap_state(self, LAP_STANDBY);
break;
default:
- DEBUG( 4, __FUNCTION__ "(), Unknown event\n");
+ IRDA_DEBUG(0, __FUNCTION__ "(), Unknown event %s\n",
+ irlmp_event[event]);
+ if (skb)
+ dev_kfree_skb(skb);
break;
}
}
@@ -310,11 +334,12 @@
struct lsap_cb *lsap;
struct lsap_cb *lsap_current;
- DEBUG( 4, __FUNCTION__ "()\n");
+ IRDA_DEBUG(4, __FUNCTION__ "()\n");
- switch( event) {
+ switch (event) {
case LM_LAP_CONNECT_REQUEST:
- DEBUG( 4, __FUNCTION__ "(), LS_CONNECT_REQUEST\n");
+ IRDA_DEBUG(4, __FUNCTION__ "(), LS_CONNECT_REQUEST\n");
+ self->refcount++;
/*
* LAP connection allready active, just bounce back! Since we
@@ -324,7 +349,7 @@
*/
lsap = (struct lsap_cb *) hashbin_get_first(self->lsaps);
while (lsap != NULL) {
- irlmp_do_lsap_event(lsap, LM_LAP_CONNECT_CONFIRM, skb);
+ irlmp_do_lsap_event(lsap, LM_LAP_CONNECT_CONFIRM, NULL);
lsap = (struct lsap_cb*) hashbin_get_next(self->lsaps);
}
@@ -336,12 +361,12 @@
/* Be sure to stay one item ahead */
lsap = (struct lsap_cb*) hashbin_get_next(irlmp->unconnected_lsaps);
irlmp_do_lsap_event(lsap_current,
- LM_LAP_CONNECT_CONFIRM, skb);
+ LM_LAP_CONNECT_CONFIRM, NULL);
}
/* Keep state */
break;
case LM_LAP_DISCONNECT_REQUEST:
- DEBUG(4, __FUNCTION__ "(), LM_LAP_DISCONNECT_REQUEST\n");
+ self->refcount--;
/*
* Need to find out if we should close IrLAP or not. If there
@@ -349,42 +374,44 @@
* must be the one that tries to close IrLAP. It will be
* removed later and moved to the list of unconnected LSAPs
*/
- if (hashbin_get_size(self->lsaps) == 1)
+ if (HASHBIN_GET_SIZE(self->lsaps) > 0)
irlmp_start_idle_timer(self, LM_IDLE_TIMEOUT);
-
+ else {
+ /* No more connections, so close IrLAP */
+ irlmp_next_lap_state(self, LAP_STANDBY);
+ irlap_disconnect_request(self->irlap);
+ }
break;
case LM_LAP_IDLE_TIMEOUT:
- if (hashbin_get_size(self->lsaps) == 0) {
- DEBUG(2, __FUNCTION__
- "(), no more LSAPs so time to close IrLAP\n");
+ if (HASHBIN_GET_SIZE(self->lsaps) == 0) {
irlmp_next_lap_state(self, LAP_STANDBY);
-
irlap_disconnect_request(self->irlap);
}
break;
case LM_LAP_DISCONNECT_INDICATION:
- DEBUG(4, __FUNCTION__ "(), IRLAP_DISCONNECT_INDICATION\n");
-
- irlmp_next_lap_state( self, LAP_STANDBY);
+ irlmp_next_lap_state(self, LAP_STANDBY);
+ self->refcount = 0;
/*
* Inform all connected LSAP's using this link
*/
- lsap = ( struct lsap_cb *) hashbin_get_first( self->lsaps);
- while ( lsap != NULL ) {
- ASSERT( lsap->magic == LMP_LSAP_MAGIC, return;);
+ lsap = (struct lsap_cb *) hashbin_get_first(self->lsaps);
+ while (lsap != NULL ) {
+ ASSERT(lsap->magic == LMP_LSAP_MAGIC, return;);
lsap_current = lsap;
/* Be sure to stay one item ahead */
- lsap = ( struct lsap_cb *) hashbin_get_next( self->lsaps);
- irlmp_do_lsap_event( lsap_current,
- LM_LAP_DISCONNECT_INDICATION,
- NULL);
+ lsap = (struct lsap_cb *) hashbin_get_next(self->lsaps);
+ irlmp_do_lsap_event(lsap_current,
+ LM_LAP_DISCONNECT_INDICATION,
+ NULL);
}
break;
default:
- DEBUG( 4, __FUNCTION__ "(), Unknown event %d\n", event);
+ IRDA_DEBUG(0, __FUNCTION__ "(), Unknown event %d\n", event);
+ if (skb)
+ dev_kfree_skb(skb);
break;
}
}
@@ -401,33 +428,59 @@
* DISCONNECTED
*
*/
-static void irlmp_state_disconnected( struct lsap_cb *self, IRLMP_EVENT event,
- struct sk_buff *skb)
+static int irlmp_state_disconnected(struct lsap_cb *self, IRLMP_EVENT event,
+ struct sk_buff *skb)
{
- DEBUG( 4, __FUNCTION__ "()\n");
+ int ret = 0;
- ASSERT( self != NULL, return;);
- ASSERT( self->magic == LMP_LSAP_MAGIC, return;);
+ IRDA_DEBUG(4, __FUNCTION__ "()\n");
- switch( event) {
+ ASSERT(self != NULL, return -1;);
+ ASSERT(self->magic == LMP_LSAP_MAGIC, return -1;);
+
+ switch (event) {
+#ifdef CONFIG_IRDA_ULTRA
+ case LM_UDATA_INDICATION:
+ irlmp_connless_data_indication(self, skb);
+ break;
+#endif /* CONFIG_IRDA_ULTRA */
case LM_CONNECT_REQUEST:
- DEBUG( 4, __FUNCTION__ "(), LM_CONNECT_REQUEST\n");
- irlmp_next_lsap_state( self, LSAP_SETUP_PEND);
+ IRDA_DEBUG(4, __FUNCTION__ "(), LM_CONNECT_REQUEST\n");
+
+ if (self->conn_skb) {
+ WARNING(__FUNCTION__
+ "(), busy with another request!\n");
+ return -EBUSY;
+ }
+ self->conn_skb = skb;
+
+ irlmp_next_lsap_state(self, LSAP_SETUP_PEND);
irlmp_do_lap_event(self->lap, LM_LAP_CONNECT_REQUEST, NULL);
- /* Start watchdog timer ( 5 secs for now) */
- irlmp_start_watchdog_timer(self, 500);
+ /* Start watchdog timer (5 secs for now) */
+ irlmp_start_watchdog_timer(self, 5*HZ);
break;
case LM_CONNECT_INDICATION:
irlmp_next_lsap_state(self, LSAP_CONNECT_PEND);
- irlmp_do_lap_event(self->lap, LM_LAP_CONNECT_REQUEST, skb);
+ if (self->conn_skb) {
+ WARNING(__FUNCTION__
+ "(), busy with another request!\n");
+ return -EBUSY;
+ }
+ self->conn_skb = skb;
+
+ irlmp_do_lap_event(self->lap, LM_LAP_CONNECT_REQUEST, NULL);
break;
default:
- DEBUG( 4, __FUNCTION__ "(), Unknown event %d\n", event);
+ IRDA_DEBUG(2, __FUNCTION__ "(), Unknown event %s\n",
+ irlmp_event[event]);
+ if (skb)
+ dev_kfree_skb(skb);
break;
}
+ return ret;
}
/*
@@ -436,19 +489,20 @@
* CONNECT
*
*/
-static void irlmp_state_connect( struct lsap_cb *self, IRLMP_EVENT event,
- struct sk_buff *skb)
+static int irlmp_state_connect(struct lsap_cb *self, IRLMP_EVENT event,
+ struct sk_buff *skb)
{
struct lsap_cb *lsap;
+ int ret = 0;
- DEBUG( 4, __FUNCTION__ "()\n");
+ IRDA_DEBUG(4, __FUNCTION__ "()\n");
- ASSERT( self != NULL, return;);
- ASSERT( self->magic == LMP_LSAP_MAGIC, return;);
+ ASSERT(self != NULL, return -1;);
+ ASSERT(self->magic == LMP_LSAP_MAGIC, return -1;);
- switch( event) {
+ switch (event) {
case LM_CONNECT_RESPONSE:
- ASSERT( skb != NULL, return;);
+ del_timer(&self->watchdog_timer);
/*
* Bind this LSAP to the IrLAP link where the connect was
@@ -457,25 +511,27 @@
lsap = hashbin_remove(irlmp->unconnected_lsaps, (int) self,
NULL);
- ASSERT(lsap == self, return;);
+ ASSERT(lsap == self, return -1;);
+ ASSERT(self->lap != NULL, return -1;);
+ ASSERT(self->lap->lsaps != NULL, return -1;);
- ASSERT(self->lap != NULL, return;);
- ASSERT(self->lap->lsaps != NULL, return;);
-
- hashbin_insert(self->lap->lsaps, (QUEUE *) self, (int) self,
+ hashbin_insert(self->lap->lsaps, (queue_t *) self, (int) self,
NULL);
+ self->connected = TRUE;
+ irlmp_next_lsap_state(self, LSAP_DATA_TRANSFER_READY);
+
irlmp_send_lcf_pdu(self->lap, self->dlsap_sel,
self->slsap_sel, CONNECT_CNF, skb);
-
- del_timer(&self->watchdog_timer);
-
- irlmp_next_lsap_state(self, LSAP_DATA_TRANSFER_READY);
break;
default:
- DEBUG( 4, __FUNCTION__ "(), Unknown event\n");
+ IRDA_DEBUG(0, __FUNCTION__ "(), Unknown event %s\n",
+ irlmp_event[event]);
+ if (skb)
+ dev_kfree_skb(skb);
break;
}
+ return ret;
}
/*
@@ -484,37 +540,47 @@
* CONNECT_PEND
*
*/
-static void irlmp_state_connect_pend(struct lsap_cb *self, IRLMP_EVENT event,
- struct sk_buff *skb)
+static int irlmp_state_connect_pend(struct lsap_cb *self, IRLMP_EVENT event,
+ struct sk_buff *skb)
{
- DEBUG( 4, __FUNCTION__ "()\n");
+ int ret = 0;
+
+ IRDA_DEBUG(4, __FUNCTION__ "()\n");
- ASSERT( self != NULL, return;);
- ASSERT( self->magic == LMP_LSAP_MAGIC, return;);
+ ASSERT(self != NULL, return -1;);
+ ASSERT(self->magic == LMP_LSAP_MAGIC, return -1;);
- switch( event) {
+ switch (event) {
case LM_CONNECT_REQUEST:
/* Keep state */
break;
case LM_CONNECT_RESPONSE:
- DEBUG(0, __FUNCTION__ "(), LM_CONNECT_RESPONSE, "
- "no indication issued yet\n");
+ IRDA_DEBUG(0, __FUNCTION__ "(), LM_CONNECT_RESPONSE, "
+ "no indication issued yet\n");
/* Keep state */
break;
case LM_DISCONNECT_REQUEST:
- DEBUG(0, __FUNCTION__ "(), LM_DISCONNECT_REQUEST, "
- "not yet bound to IrLAP connection\n");
+ IRDA_DEBUG(0, __FUNCTION__ "(), LM_DISCONNECT_REQUEST, "
+ "not yet bound to IrLAP connection\n");
/* Keep state */
break;
case LM_LAP_CONNECT_CONFIRM:
- DEBUG(4, __FUNCTION__ "(), LS_CONNECT_CONFIRM\n");
+ IRDA_DEBUG(4, __FUNCTION__ "(), LS_CONNECT_CONFIRM\n");
irlmp_next_lsap_state(self, LSAP_CONNECT);
+
+ skb = self->conn_skb;
+ self->conn_skb = NULL;
+
irlmp_connect_indication(self, skb);
break;
default:
- DEBUG( 4, __FUNCTION__ "Unknown event %d\n", event);
+ IRDA_DEBUG(0, __FUNCTION__ "Unknown event %s\n",
+ irlmp_event[event]);
+ if (skb)
+ dev_kfree_skb(skb);
break;
- }
+ }
+ return ret;
}
/*
@@ -523,56 +589,52 @@
* DATA_TRANSFER_READY
*
*/
-static void irlmp_state_dtr(struct lsap_cb *self, IRLMP_EVENT event,
- struct sk_buff *skb)
+static int irlmp_state_dtr(struct lsap_cb *self, IRLMP_EVENT event,
+ struct sk_buff *skb)
{
LM_REASON reason;
+ int ret = 0;
- DEBUG(4, __FUNCTION__ "()\n");
+ IRDA_DEBUG(4, __FUNCTION__ "()\n");
- ASSERT(self != NULL, return;);
- ASSERT(self->magic == LMP_LSAP_MAGIC, return;);
- ASSERT(self->lap != NULL, return;);
+ ASSERT(self != NULL, return -1;);
+ ASSERT(self->magic == LMP_LSAP_MAGIC, return -1;);
+ ASSERT(self->lap != NULL, return -1;);
switch (event) {
case LM_DATA_REQUEST: /* Optimize for the common case */
irlmp_send_data_pdu(self->lap, self->dlsap_sel,
self->slsap_sel, FALSE, skb);
- /* irlmp_next_lsap_state( DATA_TRANSFER_READY, info->handle);*/
break;
case LM_DATA_INDICATION: /* Optimize for the common case */
irlmp_data_indication(self, skb);
- /* irlmp_next_lsap_state( DATA_TRANSFER_READY, info->handle);*/
break;
case LM_UDATA_REQUEST:
- ASSERT(skb != NULL, return;);
+ ASSERT(skb != NULL, return -1;);
irlmp_send_data_pdu(self->lap, self->dlsap_sel,
self->slsap_sel, TRUE, skb);
break;
case LM_UDATA_INDICATION:
irlmp_udata_indication(self, skb);
- /* irlmp_next_lsap_state( DATA_TRANSFER_READY, info->handle);*/
break;
case LM_CONNECT_REQUEST:
- DEBUG(0, __FUNCTION__ "(), LM_CONNECT_REQUEST, "
- "error, LSAP already connected\n");
+ IRDA_DEBUG(0, __FUNCTION__ "(), LM_CONNECT_REQUEST, "
+ "error, LSAP already connected\n");
/* Keep state */
break;
case LM_CONNECT_RESPONSE:
- DEBUG(0, __FUNCTION__ "(), LM_CONNECT_RESPONSE, "
- "error, LSAP allready connected\n");
+ IRDA_DEBUG(0, __FUNCTION__ "(), LM_CONNECT_RESPONSE, "
+ "error, LSAP allready connected\n");
/* Keep state */
break;
case LM_DISCONNECT_REQUEST:
- ASSERT(skb != NULL, return;);
-
- irlmp_send_lcf_pdu(self->lap, self->dlsap_sel,
- self->slsap_sel, DISCONNECT, skb);
+ irlmp_send_lcf_pdu(self->lap, self->dlsap_sel, self->slsap_sel,
+ DISCONNECT, skb);
irlmp_next_lsap_state(self, LSAP_DISCONNECTED);
/* Try to close the LAP connection if its still there */
if (self->lap) {
- DEBUG(4, __FUNCTION__ "(), trying to close IrLAP\n");
+ IRDA_DEBUG(4, __FUNCTION__ "(), trying to close IrLAP\n");
irlmp_do_lap_event(self->lap,
LM_LAP_DISCONNECT_REQUEST,
NULL);
@@ -588,23 +650,27 @@
case LM_DISCONNECT_INDICATION:
irlmp_next_lsap_state(self, LSAP_DISCONNECTED);
- ASSERT(self->lap != NULL, return;);
- ASSERT(self->lap->magic == LMP_LAP_MAGIC, return;);
+ ASSERT(self->lap != NULL, return -1;);
+ ASSERT(self->lap->magic == LMP_LAP_MAGIC, return -1;);
- ASSERT(skb != NULL, return;);
- ASSERT(skb->len > 3, return;);
+ ASSERT(skb != NULL, return -1;);
+ ASSERT(skb->len > 3, return -1;);
reason = skb->data[3];
/* Try to close the LAP connection */
- DEBUG(4, __FUNCTION__ "(), trying to close IrLAP\n");
+ IRDA_DEBUG(4, __FUNCTION__ "(), trying to close IrLAP\n");
irlmp_do_lap_event(self->lap, LM_LAP_DISCONNECT_REQUEST, NULL);
irlmp_disconnect_indication(self, reason, skb);
break;
default:
- DEBUG(4, __FUNCTION__ "(), Unknown event %d\n", event);
+ IRDA_DEBUG(0, __FUNCTION__ "(), Unknown event %s\n",
+ irlmp_event[event]);
+ if (skb)
+ dev_kfree_skb(skb);
break;
- }
+ }
+ return ret;
}
/*
@@ -614,54 +680,70 @@
* An LSAP connection request has been transmitted to the peer
* LSAP-Connection Control FSM and we are awaiting reply.
*/
-static void irlmp_state_setup( struct lsap_cb *self, IRLMP_EVENT event,
- struct sk_buff *skb)
+static int irlmp_state_setup(struct lsap_cb *self, IRLMP_EVENT event,
+ struct sk_buff *skb)
{
LM_REASON reason;
-
- ASSERT( self != NULL, return;);
- ASSERT( self->magic == LMP_LSAP_MAGIC, return;);
+ int ret = 0;
- DEBUG( 4, __FUNCTION__ "()\n");
+ ASSERT(self != NULL, return -1;);
+ ASSERT(self->magic == LMP_LSAP_MAGIC, return -1;);
- switch( event) {
- case LM_CONNECT_CONFIRM:
- ASSERT( skb != NULL, return;);
+ IRDA_DEBUG(4, __FUNCTION__ "()\n");
- irlmp_next_lsap_state( self, LSAP_DATA_TRANSFER_READY);
+ switch (event) {
+ case LM_CONNECT_CONFIRM:
+ irlmp_next_lsap_state(self, LSAP_DATA_TRANSFER_READY);
- del_timer( &self->watchdog_timer);
+ del_timer(&self->watchdog_timer);
- irlmp_connect_confirm( self, skb);
+ irlmp_connect_confirm(self, skb);
break;
case LM_DISCONNECT_INDICATION:
- DEBUG(0, __FUNCTION__ "(), this should never happen!!\n");
+ irlmp_next_lsap_state(self, LSAP_DISCONNECTED);
+
+ ASSERT(self->lap != NULL, return -1;);
+ ASSERT(self->lap->magic == LMP_LAP_MAGIC, return -1;);
+
+ ASSERT(skb != NULL, return -1;);
+ ASSERT(skb->len > 3, return -1;);
+ reason = skb->data[3];
+
+ /* Try to close the LAP connection */
+ IRDA_DEBUG(4, __FUNCTION__ "(), trying to close IrLAP\n");
+ irlmp_do_lap_event(self->lap, LM_LAP_DISCONNECT_REQUEST, NULL);
+
+ irlmp_disconnect_indication(self, reason, skb);
break;
case LM_LAP_DISCONNECT_INDICATION:
irlmp_next_lsap_state(self, LSAP_DISCONNECTED);
del_timer(&self->watchdog_timer);
- ASSERT(self->lap != NULL, return;);
- ASSERT(self->lap->magic == LMP_LAP_MAGIC, return;);
+ ASSERT(self->lap != NULL, return -1;);
+ ASSERT(self->lap->magic == LMP_LAP_MAGIC, return -1;);
reason = irlmp_convert_lap_reason(self->lap->reason);
irlmp_disconnect_indication(self, reason, skb);
break;
case LM_WATCHDOG_TIMEOUT:
- DEBUG( 0, __FUNCTION__ "() WATCHDOG_TIMEOUT!\n");
+ IRDA_DEBUG(0, __FUNCTION__ "() WATCHDOG_TIMEOUT!\n");
- ASSERT( self->lap != NULL, return;);
- irlmp_do_lap_event( self->lap, LM_LAP_DISCONNECT_REQUEST, NULL);
- irlmp_next_lsap_state( self, LSAP_DISCONNECTED);
+ ASSERT(self->lap != NULL, return -1;);
+ irlmp_do_lap_event(self->lap, LM_LAP_DISCONNECT_REQUEST, NULL);
+ irlmp_next_lsap_state(self, LSAP_DISCONNECTED);
- irlmp_disconnect_indication( self, LM_CONNECT_FAILURE, NULL);
+ irlmp_disconnect_indication(self, LM_CONNECT_FAILURE, NULL);
break;
default:
- DEBUG( 4, __FUNCTION__ "(), Unknown event %d\n", event);
+ IRDA_DEBUG(0, __FUNCTION__ "(), Unknown event %s\n",
+ irlmp_event[event]);
+ if (skb)
+ dev_kfree_skb(skb);
break;
}
+ return ret;
}
/*
@@ -672,57 +754,67 @@
* LAP FSM to set up the underlying IrLAP connection, and we
* are awaiting confirm.
*/
-static void irlmp_state_setup_pend( struct lsap_cb *self, IRLMP_EVENT event,
- struct sk_buff *skb)
+static int irlmp_state_setup_pend(struct lsap_cb *self, IRLMP_EVENT event,
+ struct sk_buff *skb)
{
LM_REASON reason;
+ int ret = 0;
- DEBUG( 4, __FUNCTION__ "()\n");
+ IRDA_DEBUG(4, __FUNCTION__ "()\n");
- ASSERT( self != NULL, return;);
- ASSERT( irlmp != NULL, return;);
+ ASSERT(self != NULL, return -1;);
+ ASSERT(irlmp != NULL, return -1;);
- switch( event) {
+ switch (event) {
case LM_LAP_CONNECT_CONFIRM:
- irlmp_send_lcf_pdu( self->lap, self->dlsap_sel,
- self->slsap_sel, CONNECT_CMD,
- self->tmp_skb);
- irlmp_next_lsap_state( self, LSAP_SETUP);
+ ASSERT(self->conn_skb != NULL, return -1;);
+
+ skb = self->conn_skb;
+ self->conn_skb = NULL;
+
+ irlmp_send_lcf_pdu(self->lap, self->dlsap_sel,
+ self->slsap_sel, CONNECT_CMD, skb);
+
+ irlmp_next_lsap_state(self, LSAP_SETUP);
break;
case LM_WATCHDOG_TIMEOUT:
- DEBUG( 0, __FUNCTION__ "() WATCHDOG_TIMEOUT!\n");
+ IRDA_DEBUG(0, __FUNCTION__ "() WATCHDOG_TIMEOUT!\n");
- ASSERT( self->lap != NULL, return;);
+ ASSERT(self->lap != NULL, return -1;);
irlmp_do_lap_event(self->lap, LM_LAP_DISCONNECT_REQUEST, NULL);
- irlmp_next_lsap_state( self, LSAP_DISCONNECTED);
+ irlmp_next_lsap_state(self, LSAP_DISCONNECTED);
- irlmp_disconnect_indication( self, LM_CONNECT_FAILURE, NULL);
+ irlmp_disconnect_indication(self, LM_CONNECT_FAILURE, NULL);
break;
case LM_LAP_DISCONNECT_INDICATION: /* LS_Disconnect.indication */
del_timer( &self->watchdog_timer);
- irlmp_next_lsap_state( self, LSAP_DISCONNECTED);
+ irlmp_next_lsap_state(self, LSAP_DISCONNECTED);
- reason = irlmp_convert_lap_reason( self->lap->reason);
+ reason = irlmp_convert_lap_reason(self->lap->reason);
- irlmp_disconnect_indication( self, reason, NULL);
+ irlmp_disconnect_indication(self, reason, NULL);
break;
default:
- DEBUG( 4, __FUNCTION__ "(), Unknown event %d\n", event);
+ IRDA_DEBUG(0, __FUNCTION__ "(), Unknown event %s\n",
+ irlmp_event[event]);
+ if (skb)
+ dev_kfree_skb(skb);
break;
}
+ return ret;
}
-void irlmp_next_lap_state( struct lap_cb *self, IRLMP_STATE state)
+void irlmp_next_lap_state(struct lap_cb *self, IRLMP_STATE state)
{
- DEBUG( 4, __FUNCTION__ "(), LMP LAP = %s\n", irlmp_state[state]);
+ IRDA_DEBUG(4, __FUNCTION__ "(), LMP LAP = %s\n", irlmp_state[state]);
self->lap_state = state;
}
-void irlmp_next_lsap_state( struct lsap_cb *self, LSAP_STATE state)
+void irlmp_next_lsap_state(struct lsap_cb *self, LSAP_STATE state)
{
- ASSERT( self != NULL, return;);
+ ASSERT(self != NULL, return;);
- DEBUG( 4, __FUNCTION__ "(), LMP LSAP = %s\n", irlsap_state[state]);
+ IRDA_DEBUG(4, __FUNCTION__ "(), LMP LSAP = %s\n", irlsap_state[state]);
self->lsap_state = state;
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)