aboutsummaryrefslogtreecommitdiffstats
path: root/net/rose/af_rose.c
diff options
context:
space:
mode:
authorBernard Pidoux <f6bvp@amsat.org>2008-06-17 20:08:32 -0400
committerDavid S. Miller <davem@davemloft.net>2008-06-17 20:08:32 -0400
commitfe2c802ab62aa63d276deafa905875f3455f2621 (patch)
treed1c18ba0e95e3ed522b216673e57ec795da99a41 /net/rose/af_rose.c
parente92481f95375aa2702ea5018b0295792ae0fa9c1 (diff)
rose: improving AX25 routing frames via ROSE network
ROSE network is organized through nodes connected via hamradio or Internet. AX25 packet radio frames sent to a remote ROSE address destination are routed through these nodes. Without the present patch, automatic routing mechanism did not work optimally due to an improper parameter checking. rose_get_neigh() function is called either by rose_connect() or by rose_route_frame(). In the case of a call from rose_connect(), f0 timer is checked to find if a connection is already pending. In that case it returns the address of the neighbour, or returns a NULL otherwise. When called by rose_route_frame() the purpose was to route a packet AX25 frame through an adjacent node given a destination rose address. However, in that case, t0 timer checked does not indicate if the adjacent node is actually connected even if the timer is not null. Thus, for each frame sent, the function often tried to start a new connexion even if the adjacent node was already connected. The patch adds a "new" parameter that is true when the function is called by rose route_frame(). This instructs rose_get_neigh() to check node parameter "restarted". If restarted is true it means that the route to the destination address is opened via a neighbour node already connected. If "restarted" is false the function returns a NULL. In that case the calling function will initiate a new connection as before. This results in a fast routing of frames, from nodes to nodes, until destination is reached, as originaly specified by ROSE protocole. Signed-off-by: Bernard Pidoux <f6bvp@amsat.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rose/af_rose.c')
-rw-r--r--net/rose/af_rose.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index af86bcb604e5..46461a69cd0f 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -757,7 +757,7 @@ static int rose_connect(struct socket *sock, struct sockaddr *uaddr, int addr_le
757 sock->state = SS_UNCONNECTED; 757 sock->state = SS_UNCONNECTED;
758 758
759 rose->neighbour = rose_get_neigh(&addr->srose_addr, &cause, 759 rose->neighbour = rose_get_neigh(&addr->srose_addr, &cause,
760 &diagnostic); 760 &diagnostic, 0);
761 if (!rose->neighbour) { 761 if (!rose->neighbour) {
762 err = -ENETUNREACH; 762 err = -ENETUNREACH;
763 goto out_release; 763 goto out_release;
@@ -853,7 +853,7 @@ rose_try_next_neigh:
853 853
854 if (sk->sk_state != TCP_ESTABLISHED) { 854 if (sk->sk_state != TCP_ESTABLISHED) {
855 /* Try next neighbour */ 855 /* Try next neighbour */
856 rose->neighbour = rose_get_neigh(&addr->srose_addr, &cause, &diagnostic); 856 rose->neighbour = rose_get_neigh(&addr->srose_addr, &cause, &diagnostic, 0);
857 if (rose->neighbour) 857 if (rose->neighbour)
858 goto rose_try_next_neigh; 858 goto rose_try_next_neigh;
859 859