2006-01-02 18:04:38 +00:00
|
|
|
/*
|
|
|
|
* net/tipc/port.c: TIPC port code
|
2007-02-09 14:25:21 +00:00
|
|
|
*
|
2007-06-11 00:25:24 +00:00
|
|
|
* Copyright (c) 1992-2007, Ericsson AB
|
2013-06-17 14:54:42 +00:00
|
|
|
* Copyright (c) 2004-2008, 2010-2013, Wind River Systems
|
2006-01-02 18:04:38 +00:00
|
|
|
* All rights reserved.
|
|
|
|
*
|
2006-01-11 12:30:43 +00:00
|
|
|
* Redistribution and use in source and binary forms, with or without
|
2006-01-02 18:04:38 +00:00
|
|
|
* modification, are permitted provided that the following conditions are met:
|
|
|
|
*
|
2006-01-11 12:30:43 +00:00
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
* 3. Neither the names of the copyright holders nor the names of its
|
|
|
|
* contributors may be used to endorse or promote products derived from
|
|
|
|
* this software without specific prior written permission.
|
2006-01-02 18:04:38 +00:00
|
|
|
*
|
2006-01-11 12:30:43 +00:00
|
|
|
* Alternatively, this software may be distributed under the terms of the
|
|
|
|
* GNU General Public License ("GPL") version 2 as published by the Free
|
|
|
|
* Software Foundation.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
|
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
|
|
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
|
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
|
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
|
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
2006-01-02 18:04:38 +00:00
|
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "core.h"
|
|
|
|
#include "config.h"
|
|
|
|
#include "port.h"
|
|
|
|
#include "name_table.h"
|
|
|
|
|
|
|
|
/* Connection management: */
|
|
|
|
#define PROBING_INTERVAL 3600000 /* [ms] => 1 h */
|
|
|
|
#define CONFIRMED 0
|
|
|
|
#define PROBING 1
|
|
|
|
|
|
|
|
#define MAX_REJECT_SIZE 1024
|
|
|
|
|
2006-06-27 09:53:55 +00:00
|
|
|
DEFINE_SPINLOCK(tipc_port_list_lock);
|
2006-01-02 18:04:38 +00:00
|
|
|
|
2006-01-17 23:38:21 +00:00
|
|
|
static LIST_HEAD(ports);
|
2006-01-02 18:04:38 +00:00
|
|
|
static void port_handle_node_down(unsigned long ref);
|
2011-01-07 16:43:40 +00:00
|
|
|
static struct sk_buff *port_build_self_abort_msg(struct tipc_port *, u32 err);
|
|
|
|
static struct sk_buff *port_build_peer_abort_msg(struct tipc_port *, u32 err);
|
2006-01-02 18:04:38 +00:00
|
|
|
static void port_timeout(unsigned long ref);
|
|
|
|
|
|
|
|
|
2012-04-23 04:49:13 +00:00
|
|
|
static u32 port_peernode(struct tipc_port *p_ptr)
|
2006-01-02 18:04:38 +00:00
|
|
|
{
|
2011-01-07 16:43:40 +00:00
|
|
|
return msg_destnode(&p_ptr->phdr);
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
|
2012-04-23 04:49:13 +00:00
|
|
|
static u32 port_peerport(struct tipc_port *p_ptr)
|
2006-01-02 18:04:38 +00:00
|
|
|
{
|
2011-01-07 16:43:40 +00:00
|
|
|
return msg_destport(&p_ptr->phdr);
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
|
2012-07-10 10:55:09 +00:00
|
|
|
/**
|
2012-04-17 22:42:28 +00:00
|
|
|
* tipc_port_peer_msg - verify message was sent by connected port's peer
|
|
|
|
*
|
|
|
|
* Handles cases where the node's network address has changed from
|
|
|
|
* the default of <0.0.0> to its configured setting.
|
|
|
|
*/
|
|
|
|
int tipc_port_peer_msg(struct tipc_port *p_ptr, struct tipc_msg *msg)
|
|
|
|
{
|
|
|
|
u32 peernode;
|
|
|
|
u32 orignode;
|
|
|
|
|
|
|
|
if (msg_origport(msg) != port_peerport(p_ptr))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
orignode = msg_orignode(msg);
|
|
|
|
peernode = port_peernode(p_ptr);
|
|
|
|
return (orignode == peernode) ||
|
|
|
|
(!orignode && (peernode == tipc_own_addr)) ||
|
|
|
|
(!peernode && (orignode == tipc_own_addr));
|
|
|
|
}
|
|
|
|
|
2006-01-02 18:04:38 +00:00
|
|
|
/**
|
|
|
|
* tipc_multicast - send a multicast message to local and remote destinations
|
|
|
|
*/
|
2010-11-30 12:00:59 +00:00
|
|
|
int tipc_multicast(u32 ref, struct tipc_name_seq const *seq,
|
tipc: Avoid recomputation of outgoing message length
Rework TIPC's message sending routines to take advantage of the total
amount of data value passed to it by the kernel socket infrastructure.
This change eliminates the need for TIPC to compute the size of outgoing
messages itself, as well as the check for an oversize message in
tipc_msg_build(). In addition, this change warrants an explanation:
- res = send_packet(NULL, sock, &my_msg, 0);
+ res = send_packet(NULL, sock, &my_msg, bytes_to_send);
Previously, the final argument to send_packet() was ignored (since the
amount of data being sent was recalculated by a lower-level routine)
and we could just pass in a dummy value (0). Now that the
recalculation is being eliminated, the argument value being passed to
send_packet() is significant and we have to supply the actual amount
of data we want to send.
Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2011-04-21 15:42:07 +00:00
|
|
|
u32 num_sect, struct iovec const *msg_sect,
|
|
|
|
unsigned int total_len)
|
2006-01-02 18:04:38 +00:00
|
|
|
{
|
|
|
|
struct tipc_msg *hdr;
|
|
|
|
struct sk_buff *buf;
|
|
|
|
struct sk_buff *ibuf = NULL;
|
2011-12-30 01:33:30 +00:00
|
|
|
struct tipc_port_list dports = {0, NULL, };
|
2011-01-07 16:43:40 +00:00
|
|
|
struct tipc_port *oport = tipc_port_deref(ref);
|
2006-01-02 18:04:38 +00:00
|
|
|
int ext_targets;
|
|
|
|
int res;
|
|
|
|
|
|
|
|
if (unlikely(!oport))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
/* Create multicast message */
|
2011-01-07 16:43:40 +00:00
|
|
|
hdr = &oport->phdr;
|
2006-01-02 18:04:38 +00:00
|
|
|
msg_set_type(hdr, TIPC_MCAST_MSG);
|
2011-04-17 20:02:11 +00:00
|
|
|
msg_set_lookup_scope(hdr, TIPC_CLUSTER_SCOPE);
|
2011-04-18 14:08:22 +00:00
|
|
|
msg_set_destport(hdr, 0);
|
|
|
|
msg_set_destnode(hdr, 0);
|
2006-01-02 18:04:38 +00:00
|
|
|
msg_set_nametype(hdr, seq->type);
|
|
|
|
msg_set_namelower(hdr, seq->lower);
|
|
|
|
msg_set_nameupper(hdr, seq->upper);
|
|
|
|
msg_set_hdr_sz(hdr, MCAST_H_SIZE);
|
tipc: Avoid recomputation of outgoing message length
Rework TIPC's message sending routines to take advantage of the total
amount of data value passed to it by the kernel socket infrastructure.
This change eliminates the need for TIPC to compute the size of outgoing
messages itself, as well as the check for an oversize message in
tipc_msg_build(). In addition, this change warrants an explanation:
- res = send_packet(NULL, sock, &my_msg, 0);
+ res = send_packet(NULL, sock, &my_msg, bytes_to_send);
Previously, the final argument to send_packet() was ignored (since the
amount of data being sent was recalculated by a lower-level routine)
and we could just pass in a dummy value (0). Now that the
recalculation is being eliminated, the argument value being passed to
send_packet() is significant and we have to supply the actual amount
of data we want to send.
Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2011-04-21 15:42:07 +00:00
|
|
|
res = tipc_msg_build(hdr, msg_sect, num_sect, total_len, MAX_MSG_SIZE,
|
2013-06-17 14:54:43 +00:00
|
|
|
&buf);
|
2006-01-02 18:04:38 +00:00
|
|
|
if (unlikely(!buf))
|
|
|
|
return res;
|
|
|
|
|
|
|
|
/* Figure out where to send multicast message */
|
2006-01-17 23:38:21 +00:00
|
|
|
ext_targets = tipc_nametbl_mc_translate(seq->type, seq->lower, seq->upper,
|
|
|
|
TIPC_NODE_SCOPE, &dports);
|
2007-02-09 14:25:21 +00:00
|
|
|
|
|
|
|
/* Send message to destinations (duplicate it only if necessary) */
|
2006-01-02 18:04:38 +00:00
|
|
|
if (ext_targets) {
|
|
|
|
if (dports.count != 0) {
|
|
|
|
ibuf = skb_copy(buf, GFP_ATOMIC);
|
|
|
|
if (ibuf == NULL) {
|
2006-01-17 23:38:21 +00:00
|
|
|
tipc_port_list_free(&dports);
|
2011-11-04 17:24:29 +00:00
|
|
|
kfree_skb(buf);
|
2006-01-02 18:04:38 +00:00
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
}
|
2006-01-17 23:38:21 +00:00
|
|
|
res = tipc_bclink_send_msg(buf);
|
2010-12-31 18:59:35 +00:00
|
|
|
if ((res < 0) && (dports.count != 0))
|
2011-11-04 17:24:29 +00:00
|
|
|
kfree_skb(ibuf);
|
2006-01-02 18:04:38 +00:00
|
|
|
} else {
|
|
|
|
ibuf = buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (res >= 0) {
|
|
|
|
if (ibuf)
|
2006-01-17 23:38:21 +00:00
|
|
|
tipc_port_recv_mcast(ibuf, &dports);
|
2006-01-02 18:04:38 +00:00
|
|
|
} else {
|
2006-01-17 23:38:21 +00:00
|
|
|
tipc_port_list_free(&dports);
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2006-01-17 23:38:21 +00:00
|
|
|
* tipc_port_recv_mcast - deliver multicast message to all destination ports
|
2007-02-09 14:25:21 +00:00
|
|
|
*
|
2006-01-02 18:04:38 +00:00
|
|
|
* If there is no port list, perform a lookup to create one
|
|
|
|
*/
|
2011-12-30 01:33:30 +00:00
|
|
|
void tipc_port_recv_mcast(struct sk_buff *buf, struct tipc_port_list *dp)
|
2006-01-02 18:04:38 +00:00
|
|
|
{
|
2010-12-31 18:59:32 +00:00
|
|
|
struct tipc_msg *msg;
|
2011-12-30 01:33:30 +00:00
|
|
|
struct tipc_port_list dports = {0, NULL, };
|
|
|
|
struct tipc_port_list *item = dp;
|
2006-01-02 18:04:38 +00:00
|
|
|
int cnt = 0;
|
|
|
|
|
|
|
|
msg = buf_msg(buf);
|
|
|
|
|
|
|
|
/* Create destination port list, if one wasn't supplied */
|
|
|
|
if (dp == NULL) {
|
2006-01-17 23:38:21 +00:00
|
|
|
tipc_nametbl_mc_translate(msg_nametype(msg),
|
2006-01-02 18:04:38 +00:00
|
|
|
msg_namelower(msg),
|
|
|
|
msg_nameupper(msg),
|
|
|
|
TIPC_CLUSTER_SCOPE,
|
|
|
|
&dports);
|
|
|
|
item = dp = &dports;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Deliver a copy of message to each destination port */
|
|
|
|
if (dp->count != 0) {
|
2011-04-18 14:14:26 +00:00
|
|
|
msg_set_destnode(msg, tipc_own_addr);
|
2006-01-02 18:04:38 +00:00
|
|
|
if (dp->count == 1) {
|
|
|
|
msg_set_destport(msg, dp->ports[0]);
|
2006-01-17 23:38:21 +00:00
|
|
|
tipc_port_recv_msg(buf);
|
|
|
|
tipc_port_list_free(dp);
|
2006-01-02 18:04:38 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
for (; cnt < dp->count; cnt++) {
|
|
|
|
int index = cnt % PLSIZE;
|
|
|
|
struct sk_buff *b = skb_clone(buf, GFP_ATOMIC);
|
|
|
|
|
|
|
|
if (b == NULL) {
|
2012-06-29 04:16:37 +00:00
|
|
|
pr_warn("Unable to deliver multicast message(s)\n");
|
2006-01-02 18:04:38 +00:00
|
|
|
goto exit;
|
|
|
|
}
|
2010-12-31 18:59:35 +00:00
|
|
|
if ((index == 0) && (cnt != 0))
|
2006-01-02 18:04:38 +00:00
|
|
|
item = item->next;
|
2010-12-31 18:59:32 +00:00
|
|
|
msg_set_destport(buf_msg(b), item->ports[index]);
|
2006-01-17 23:38:21 +00:00
|
|
|
tipc_port_recv_msg(b);
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
exit:
|
2011-11-04 17:24:29 +00:00
|
|
|
kfree_skb(buf);
|
2006-01-17 23:38:21 +00:00
|
|
|
tipc_port_list_free(dp);
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2013-06-17 14:54:44 +00:00
|
|
|
* tipc_createport - create a generic TIPC port
|
2007-02-09 14:25:21 +00:00
|
|
|
*
|
2008-07-15 05:42:19 +00:00
|
|
|
* Returns pointer to (locked) TIPC port, or NULL if unable to create it
|
2006-01-02 18:04:38 +00:00
|
|
|
*/
|
2013-06-17 14:54:46 +00:00
|
|
|
struct tipc_port *tipc_createport(struct sock *sk,
|
2006-01-02 18:04:38 +00:00
|
|
|
u32 (*dispatcher)(struct tipc_port *, struct sk_buff *),
|
|
|
|
void (*wakeup)(struct tipc_port *),
|
2008-07-15 05:42:19 +00:00
|
|
|
const u32 importance)
|
2006-01-02 18:04:38 +00:00
|
|
|
{
|
2011-01-07 16:43:40 +00:00
|
|
|
struct tipc_port *p_ptr;
|
2006-01-02 18:04:38 +00:00
|
|
|
struct tipc_msg *msg;
|
|
|
|
u32 ref;
|
|
|
|
|
2006-07-21 21:51:30 +00:00
|
|
|
p_ptr = kzalloc(sizeof(*p_ptr), GFP_ATOMIC);
|
2006-06-26 06:52:17 +00:00
|
|
|
if (!p_ptr) {
|
2012-06-29 04:16:37 +00:00
|
|
|
pr_warn("Port creation failed, no memory\n");
|
2008-07-15 05:42:19 +00:00
|
|
|
return NULL;
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
2011-01-07 16:43:40 +00:00
|
|
|
ref = tipc_ref_acquire(p_ptr, &p_ptr->lock);
|
2006-01-02 18:04:38 +00:00
|
|
|
if (!ref) {
|
2012-06-29 04:16:37 +00:00
|
|
|
pr_warn("Port creation failed, ref. table exhausted\n");
|
2006-01-02 18:04:38 +00:00
|
|
|
kfree(p_ptr);
|
2008-07-15 05:42:19 +00:00
|
|
|
return NULL;
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
|
2013-06-17 14:54:46 +00:00
|
|
|
p_ptr->sk = sk;
|
2011-01-07 16:43:40 +00:00
|
|
|
p_ptr->max_pkt = MAX_PKT_DEFAULT;
|
|
|
|
p_ptr->ref = ref;
|
2006-01-02 18:04:38 +00:00
|
|
|
INIT_LIST_HEAD(&p_ptr->wait_list);
|
|
|
|
INIT_LIST_HEAD(&p_ptr->subscription.nodesub_list);
|
|
|
|
p_ptr->dispatcher = dispatcher;
|
|
|
|
p_ptr->wakeup = wakeup;
|
|
|
|
k_init_timer(&p_ptr->timer, (Handler)port_timeout, ref);
|
|
|
|
INIT_LIST_HEAD(&p_ptr->publications);
|
|
|
|
INIT_LIST_HEAD(&p_ptr->port_list);
|
2012-04-17 22:22:49 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Must hold port list lock while initializing message header template
|
|
|
|
* to ensure a change to node's own network address doesn't result
|
|
|
|
* in template containing out-dated network address information
|
|
|
|
*/
|
|
|
|
spin_lock_bh(&tipc_port_list_lock);
|
|
|
|
msg = &p_ptr->phdr;
|
|
|
|
tipc_msg_init(msg, importance, TIPC_NAMED_MSG, NAMED_H_SIZE, 0);
|
|
|
|
msg_set_origport(msg, ref);
|
2006-01-02 18:04:38 +00:00
|
|
|
list_add_tail(&p_ptr->port_list, &ports);
|
2006-01-17 23:38:21 +00:00
|
|
|
spin_unlock_bh(&tipc_port_list_lock);
|
2011-01-07 16:43:40 +00:00
|
|
|
return p_ptr;
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int tipc_deleteport(u32 ref)
|
|
|
|
{
|
2011-01-07 16:43:40 +00:00
|
|
|
struct tipc_port *p_ptr;
|
2006-03-21 06:36:47 +00:00
|
|
|
struct sk_buff *buf = NULL;
|
2006-01-02 18:04:38 +00:00
|
|
|
|
2006-03-21 06:36:47 +00:00
|
|
|
tipc_withdraw(ref, 0, NULL);
|
2006-01-17 23:38:21 +00:00
|
|
|
p_ptr = tipc_port_lock(ref);
|
2007-02-09 14:25:21 +00:00
|
|
|
if (!p_ptr)
|
2006-01-02 18:04:38 +00:00
|
|
|
return -EINVAL;
|
|
|
|
|
2006-01-17 23:38:21 +00:00
|
|
|
tipc_ref_discard(ref);
|
|
|
|
tipc_port_unlock(p_ptr);
|
2006-01-02 18:04:38 +00:00
|
|
|
|
|
|
|
k_cancel_timer(&p_ptr->timer);
|
2011-01-07 16:43:40 +00:00
|
|
|
if (p_ptr->connected) {
|
2006-01-02 18:04:38 +00:00
|
|
|
buf = port_build_peer_abort_msg(p_ptr, TIPC_ERR_NO_PORT);
|
2006-01-17 23:38:21 +00:00
|
|
|
tipc_nodesub_unsubscribe(&p_ptr->subscription);
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
|
2006-01-17 23:38:21 +00:00
|
|
|
spin_lock_bh(&tipc_port_list_lock);
|
2006-01-02 18:04:38 +00:00
|
|
|
list_del(&p_ptr->port_list);
|
|
|
|
list_del(&p_ptr->wait_list);
|
2006-01-17 23:38:21 +00:00
|
|
|
spin_unlock_bh(&tipc_port_list_lock);
|
2006-01-02 18:04:38 +00:00
|
|
|
k_term_timer(&p_ptr->timer);
|
|
|
|
kfree(p_ptr);
|
2006-01-17 23:38:21 +00:00
|
|
|
tipc_net_route_msg(buf);
|
2008-07-15 05:44:01 +00:00
|
|
|
return 0;
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
|
2011-01-07 16:43:40 +00:00
|
|
|
static int port_unreliable(struct tipc_port *p_ptr)
|
2006-01-02 18:04:38 +00:00
|
|
|
{
|
2011-01-07 16:43:40 +00:00
|
|
|
return msg_src_droppable(&p_ptr->phdr);
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int tipc_portunreliable(u32 ref, unsigned int *isunreliable)
|
|
|
|
{
|
2011-01-07 16:43:40 +00:00
|
|
|
struct tipc_port *p_ptr;
|
2007-02-09 14:25:21 +00:00
|
|
|
|
2006-01-17 23:38:21 +00:00
|
|
|
p_ptr = tipc_port_lock(ref);
|
2006-01-02 18:04:38 +00:00
|
|
|
if (!p_ptr)
|
|
|
|
return -EINVAL;
|
|
|
|
*isunreliable = port_unreliable(p_ptr);
|
2008-01-09 07:48:20 +00:00
|
|
|
tipc_port_unlock(p_ptr);
|
2008-07-15 05:44:01 +00:00
|
|
|
return 0;
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int tipc_set_portunreliable(u32 ref, unsigned int isunreliable)
|
|
|
|
{
|
2011-01-07 16:43:40 +00:00
|
|
|
struct tipc_port *p_ptr;
|
2007-02-09 14:25:21 +00:00
|
|
|
|
2006-01-17 23:38:21 +00:00
|
|
|
p_ptr = tipc_port_lock(ref);
|
2006-01-02 18:04:38 +00:00
|
|
|
if (!p_ptr)
|
|
|
|
return -EINVAL;
|
2011-01-07 16:43:40 +00:00
|
|
|
msg_set_src_droppable(&p_ptr->phdr, (isunreliable != 0));
|
2006-01-17 23:38:21 +00:00
|
|
|
tipc_port_unlock(p_ptr);
|
2008-07-15 05:44:01 +00:00
|
|
|
return 0;
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
|
2011-01-07 16:43:40 +00:00
|
|
|
static int port_unreturnable(struct tipc_port *p_ptr)
|
2006-01-02 18:04:38 +00:00
|
|
|
{
|
2011-01-07 16:43:40 +00:00
|
|
|
return msg_dest_droppable(&p_ptr->phdr);
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int tipc_portunreturnable(u32 ref, unsigned int *isunrejectable)
|
|
|
|
{
|
2011-01-07 16:43:40 +00:00
|
|
|
struct tipc_port *p_ptr;
|
2007-02-09 14:25:21 +00:00
|
|
|
|
2006-01-17 23:38:21 +00:00
|
|
|
p_ptr = tipc_port_lock(ref);
|
2006-01-02 18:04:38 +00:00
|
|
|
if (!p_ptr)
|
|
|
|
return -EINVAL;
|
|
|
|
*isunrejectable = port_unreturnable(p_ptr);
|
2008-01-09 07:48:20 +00:00
|
|
|
tipc_port_unlock(p_ptr);
|
2008-07-15 05:44:01 +00:00
|
|
|
return 0;
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int tipc_set_portunreturnable(u32 ref, unsigned int isunrejectable)
|
|
|
|
{
|
2011-01-07 16:43:40 +00:00
|
|
|
struct tipc_port *p_ptr;
|
2007-02-09 14:25:21 +00:00
|
|
|
|
2006-01-17 23:38:21 +00:00
|
|
|
p_ptr = tipc_port_lock(ref);
|
2006-01-02 18:04:38 +00:00
|
|
|
if (!p_ptr)
|
|
|
|
return -EINVAL;
|
2011-01-07 16:43:40 +00:00
|
|
|
msg_set_dest_droppable(&p_ptr->phdr, (isunrejectable != 0));
|
2006-01-17 23:38:21 +00:00
|
|
|
tipc_port_unlock(p_ptr);
|
2008-07-15 05:44:01 +00:00
|
|
|
return 0;
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
|
2007-02-09 14:25:21 +00:00
|
|
|
/*
|
2011-06-01 20:21:12 +00:00
|
|
|
* port_build_proto_msg(): create connection protocol message for port
|
|
|
|
*
|
|
|
|
* On entry the port must be locked and connected.
|
2006-01-02 18:04:38 +00:00
|
|
|
*/
|
2011-06-01 20:21:12 +00:00
|
|
|
static struct sk_buff *port_build_proto_msg(struct tipc_port *p_ptr,
|
|
|
|
u32 type, u32 ack)
|
2006-01-02 18:04:38 +00:00
|
|
|
{
|
|
|
|
struct sk_buff *buf;
|
|
|
|
struct tipc_msg *msg;
|
2007-02-09 14:25:21 +00:00
|
|
|
|
2011-05-31 19:03:18 +00:00
|
|
|
buf = tipc_buf_acquire(INT_H_SIZE);
|
2006-01-02 18:04:38 +00:00
|
|
|
if (buf) {
|
|
|
|
msg = buf_msg(buf);
|
2011-06-01 20:21:12 +00:00
|
|
|
tipc_msg_init(msg, CONN_MANAGER, type, INT_H_SIZE,
|
|
|
|
port_peernode(p_ptr));
|
|
|
|
msg_set_destport(msg, port_peerport(p_ptr));
|
|
|
|
msg_set_origport(msg, p_ptr->ref);
|
2006-01-02 18:04:38 +00:00
|
|
|
msg_set_msgcnt(msg, ack);
|
|
|
|
}
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
int tipc_reject_msg(struct sk_buff *buf, u32 err)
|
|
|
|
{
|
|
|
|
struct tipc_msg *msg = buf_msg(buf);
|
|
|
|
struct sk_buff *rbuf;
|
|
|
|
struct tipc_msg *rmsg;
|
|
|
|
int hdr_sz;
|
2011-05-23 20:23:32 +00:00
|
|
|
u32 imp;
|
2006-01-02 18:04:38 +00:00
|
|
|
u32 data_sz = msg_data_sz(msg);
|
2011-05-24 17:20:09 +00:00
|
|
|
u32 src_node;
|
2011-05-23 20:23:32 +00:00
|
|
|
u32 rmsg_sz;
|
2006-01-02 18:04:38 +00:00
|
|
|
|
|
|
|
/* discard rejected message if it shouldn't be returned to sender */
|
2011-05-23 17:57:25 +00:00
|
|
|
if (WARN(!msg_isdata(msg),
|
|
|
|
"attempt to reject message with user=%u", msg_user(msg))) {
|
|
|
|
dump_stack();
|
|
|
|
goto exit;
|
|
|
|
}
|
2011-05-23 17:47:44 +00:00
|
|
|
if (msg_errcode(msg) || msg_dest_droppable(msg))
|
|
|
|
goto exit;
|
2006-01-02 18:04:38 +00:00
|
|
|
|
2011-05-23 20:23:32 +00:00
|
|
|
/*
|
|
|
|
* construct returned message by copying rejected message header and
|
|
|
|
* data (or subset), then updating header fields that need adjusting
|
|
|
|
*/
|
|
|
|
hdr_sz = msg_hdr_sz(msg);
|
|
|
|
rmsg_sz = hdr_sz + min_t(u32, data_sz, MAX_REJECT_SIZE);
|
|
|
|
|
|
|
|
rbuf = tipc_buf_acquire(rmsg_sz);
|
2011-05-23 17:47:44 +00:00
|
|
|
if (rbuf == NULL)
|
|
|
|
goto exit;
|
|
|
|
|
2006-01-02 18:04:38 +00:00
|
|
|
rmsg = buf_msg(rbuf);
|
2011-05-23 20:23:32 +00:00
|
|
|
skb_copy_to_linear_data(rbuf, msg, rmsg_sz);
|
|
|
|
|
|
|
|
if (msg_connected(rmsg)) {
|
|
|
|
imp = msg_importance(rmsg);
|
|
|
|
if (imp < TIPC_CRITICAL_IMPORTANCE)
|
|
|
|
msg_set_importance(rmsg, ++imp);
|
2008-06-05 00:48:25 +00:00
|
|
|
}
|
2011-05-23 20:23:32 +00:00
|
|
|
msg_set_non_seq(rmsg, 0);
|
|
|
|
msg_set_size(rmsg, rmsg_sz);
|
|
|
|
msg_set_errcode(rmsg, err);
|
|
|
|
msg_set_prevnode(rmsg, tipc_own_addr);
|
|
|
|
msg_swap_words(rmsg, 4, 5);
|
|
|
|
if (!msg_short(rmsg))
|
|
|
|
msg_swap_words(rmsg, 6, 7);
|
2006-01-02 18:04:38 +00:00
|
|
|
|
|
|
|
/* send self-abort message when rejecting on a connected port */
|
|
|
|
if (msg_connected(msg)) {
|
2011-01-07 16:43:40 +00:00
|
|
|
struct tipc_port *p_ptr = tipc_port_lock(msg_destport(msg));
|
2006-01-02 18:04:38 +00:00
|
|
|
|
|
|
|
if (p_ptr) {
|
2011-11-02 14:32:14 +00:00
|
|
|
struct sk_buff *abuf = NULL;
|
|
|
|
|
2011-01-07 16:43:40 +00:00
|
|
|
if (p_ptr->connected)
|
2006-01-02 18:04:38 +00:00
|
|
|
abuf = port_build_self_abort_msg(p_ptr, err);
|
2006-01-17 23:38:21 +00:00
|
|
|
tipc_port_unlock(p_ptr);
|
2011-11-02 14:32:14 +00:00
|
|
|
tipc_net_route_msg(abuf);
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-05-23 17:47:44 +00:00
|
|
|
/* send returned message & dispose of rejected message */
|
2011-05-24 17:20:09 +00:00
|
|
|
src_node = msg_prevnode(msg);
|
2012-04-18 13:42:29 +00:00
|
|
|
if (in_own_node(src_node))
|
2011-05-24 17:20:09 +00:00
|
|
|
tipc_port_recv_msg(rbuf);
|
|
|
|
else
|
|
|
|
tipc_link_send(rbuf, src_node, msg_link_selector(rmsg));
|
2011-05-23 17:47:44 +00:00
|
|
|
exit:
|
2011-11-04 17:24:29 +00:00
|
|
|
kfree_skb(buf);
|
2006-01-02 18:04:38 +00:00
|
|
|
return data_sz;
|
|
|
|
}
|
|
|
|
|
2011-01-07 16:43:40 +00:00
|
|
|
int tipc_port_reject_sections(struct tipc_port *p_ptr, struct tipc_msg *hdr,
|
2006-01-17 23:38:21 +00:00
|
|
|
struct iovec const *msg_sect, u32 num_sect,
|
tipc: Avoid recomputation of outgoing message length
Rework TIPC's message sending routines to take advantage of the total
amount of data value passed to it by the kernel socket infrastructure.
This change eliminates the need for TIPC to compute the size of outgoing
messages itself, as well as the check for an oversize message in
tipc_msg_build(). In addition, this change warrants an explanation:
- res = send_packet(NULL, sock, &my_msg, 0);
+ res = send_packet(NULL, sock, &my_msg, bytes_to_send);
Previously, the final argument to send_packet() was ignored (since the
amount of data being sent was recalculated by a lower-level routine)
and we could just pass in a dummy value (0). Now that the
recalculation is being eliminated, the argument value being passed to
send_packet() is significant and we have to supply the actual amount
of data we want to send.
Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2011-04-21 15:42:07 +00:00
|
|
|
unsigned int total_len, int err)
|
2006-01-02 18:04:38 +00:00
|
|
|
{
|
|
|
|
struct sk_buff *buf;
|
|
|
|
int res;
|
|
|
|
|
tipc: Avoid recomputation of outgoing message length
Rework TIPC's message sending routines to take advantage of the total
amount of data value passed to it by the kernel socket infrastructure.
This change eliminates the need for TIPC to compute the size of outgoing
messages itself, as well as the check for an oversize message in
tipc_msg_build(). In addition, this change warrants an explanation:
- res = send_packet(NULL, sock, &my_msg, 0);
+ res = send_packet(NULL, sock, &my_msg, bytes_to_send);
Previously, the final argument to send_packet() was ignored (since the
amount of data being sent was recalculated by a lower-level routine)
and we could just pass in a dummy value (0). Now that the
recalculation is being eliminated, the argument value being passed to
send_packet() is significant and we have to supply the actual amount
of data we want to send.
Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2011-04-21 15:42:07 +00:00
|
|
|
res = tipc_msg_build(hdr, msg_sect, num_sect, total_len, MAX_MSG_SIZE,
|
2013-06-17 14:54:43 +00:00
|
|
|
&buf);
|
2006-01-02 18:04:38 +00:00
|
|
|
if (!buf)
|
|
|
|
return res;
|
|
|
|
|
|
|
|
return tipc_reject_msg(buf, err);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void port_timeout(unsigned long ref)
|
|
|
|
{
|
2011-01-07 16:43:40 +00:00
|
|
|
struct tipc_port *p_ptr = tipc_port_lock(ref);
|
2006-03-21 06:36:47 +00:00
|
|
|
struct sk_buff *buf = NULL;
|
2006-01-02 18:04:38 +00:00
|
|
|
|
2006-10-17 04:38:05 +00:00
|
|
|
if (!p_ptr)
|
|
|
|
return;
|
|
|
|
|
2011-01-07 16:43:40 +00:00
|
|
|
if (!p_ptr->connected) {
|
2006-10-17 04:38:05 +00:00
|
|
|
tipc_port_unlock(p_ptr);
|
2006-01-02 18:04:38 +00:00
|
|
|
return;
|
2006-10-17 04:38:05 +00:00
|
|
|
}
|
2006-01-02 18:04:38 +00:00
|
|
|
|
|
|
|
/* Last probe answered ? */
|
|
|
|
if (p_ptr->probing_state == PROBING) {
|
|
|
|
buf = port_build_self_abort_msg(p_ptr, TIPC_ERR_NO_PORT);
|
|
|
|
} else {
|
2011-06-01 20:21:12 +00:00
|
|
|
buf = port_build_proto_msg(p_ptr, CONN_PROBE, 0);
|
2006-01-02 18:04:38 +00:00
|
|
|
p_ptr->probing_state = PROBING;
|
|
|
|
k_start_timer(&p_ptr->timer, p_ptr->probing_interval);
|
|
|
|
}
|
2006-01-17 23:38:21 +00:00
|
|
|
tipc_port_unlock(p_ptr);
|
|
|
|
tipc_net_route_msg(buf);
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void port_handle_node_down(unsigned long ref)
|
|
|
|
{
|
2011-01-07 16:43:40 +00:00
|
|
|
struct tipc_port *p_ptr = tipc_port_lock(ref);
|
2010-12-31 18:59:32 +00:00
|
|
|
struct sk_buff *buf = NULL;
|
2006-01-02 18:04:38 +00:00
|
|
|
|
|
|
|
if (!p_ptr)
|
|
|
|
return;
|
|
|
|
buf = port_build_self_abort_msg(p_ptr, TIPC_ERR_NO_NODE);
|
2006-01-17 23:38:21 +00:00
|
|
|
tipc_port_unlock(p_ptr);
|
|
|
|
tipc_net_route_msg(buf);
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-01-07 16:43:40 +00:00
|
|
|
static struct sk_buff *port_build_self_abort_msg(struct tipc_port *p_ptr, u32 err)
|
2006-01-02 18:04:38 +00:00
|
|
|
{
|
2011-05-31 20:10:08 +00:00
|
|
|
struct sk_buff *buf = port_build_peer_abort_msg(p_ptr, err);
|
2006-01-02 18:04:38 +00:00
|
|
|
|
2011-05-31 20:10:08 +00:00
|
|
|
if (buf) {
|
|
|
|
struct tipc_msg *msg = buf_msg(buf);
|
|
|
|
msg_swap_words(msg, 4, 5);
|
|
|
|
msg_swap_words(msg, 6, 7);
|
|
|
|
}
|
|
|
|
return buf;
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-01-07 16:43:40 +00:00
|
|
|
static struct sk_buff *port_build_peer_abort_msg(struct tipc_port *p_ptr, u32 err)
|
2006-01-02 18:04:38 +00:00
|
|
|
{
|
2011-05-31 20:10:08 +00:00
|
|
|
struct sk_buff *buf;
|
|
|
|
struct tipc_msg *msg;
|
|
|
|
u32 imp;
|
2006-01-02 18:04:38 +00:00
|
|
|
|
2011-01-07 16:43:40 +00:00
|
|
|
if (!p_ptr->connected)
|
2006-03-21 06:36:47 +00:00
|
|
|
return NULL;
|
2011-05-31 20:10:08 +00:00
|
|
|
|
|
|
|
buf = tipc_buf_acquire(BASIC_H_SIZE);
|
|
|
|
if (buf) {
|
|
|
|
msg = buf_msg(buf);
|
|
|
|
memcpy(msg, &p_ptr->phdr, BASIC_H_SIZE);
|
|
|
|
msg_set_hdr_sz(msg, BASIC_H_SIZE);
|
|
|
|
msg_set_size(msg, BASIC_H_SIZE);
|
|
|
|
imp = msg_importance(msg);
|
|
|
|
if (imp < TIPC_CRITICAL_IMPORTANCE)
|
|
|
|
msg_set_importance(msg, ++imp);
|
|
|
|
msg_set_errcode(msg, err);
|
|
|
|
}
|
|
|
|
return buf;
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
|
2006-01-17 23:38:21 +00:00
|
|
|
void tipc_port_recv_proto_msg(struct sk_buff *buf)
|
2006-01-02 18:04:38 +00:00
|
|
|
{
|
|
|
|
struct tipc_msg *msg = buf_msg(buf);
|
2011-06-01 19:08:10 +00:00
|
|
|
struct tipc_port *p_ptr;
|
2006-03-21 06:36:47 +00:00
|
|
|
struct sk_buff *r_buf = NULL;
|
2011-06-01 19:08:10 +00:00
|
|
|
u32 destport = msg_destport(msg);
|
|
|
|
int wakeable;
|
|
|
|
|
|
|
|
/* Validate connection */
|
|
|
|
p_ptr = tipc_port_lock(destport);
|
2012-04-17 22:42:28 +00:00
|
|
|
if (!p_ptr || !p_ptr->connected || !tipc_port_peer_msg(p_ptr, msg)) {
|
2011-06-01 19:48:42 +00:00
|
|
|
r_buf = tipc_buf_acquire(BASIC_H_SIZE);
|
|
|
|
if (r_buf) {
|
|
|
|
msg = buf_msg(r_buf);
|
|
|
|
tipc_msg_init(msg, TIPC_HIGH_IMPORTANCE, TIPC_CONN_MSG,
|
2012-04-17 22:42:28 +00:00
|
|
|
BASIC_H_SIZE, msg_orignode(msg));
|
2011-06-01 19:48:42 +00:00
|
|
|
msg_set_errcode(msg, TIPC_ERR_NO_PORT);
|
|
|
|
msg_set_origport(msg, destport);
|
2012-04-17 22:42:28 +00:00
|
|
|
msg_set_destport(msg, msg_origport(msg));
|
2011-06-01 19:48:42 +00:00
|
|
|
}
|
2011-06-01 19:08:10 +00:00
|
|
|
if (p_ptr)
|
|
|
|
tipc_port_unlock(p_ptr);
|
2006-01-02 18:04:38 +00:00
|
|
|
goto exit;
|
|
|
|
}
|
|
|
|
|
2011-06-01 19:08:10 +00:00
|
|
|
/* Process protocol message sent by peer */
|
|
|
|
switch (msg_type(msg)) {
|
|
|
|
case CONN_ACK:
|
|
|
|
wakeable = tipc_port_congested(p_ptr) && p_ptr->congested &&
|
|
|
|
p_ptr->wakeup;
|
|
|
|
p_ptr->acked += msg_msgcnt(msg);
|
|
|
|
if (!tipc_port_congested(p_ptr)) {
|
|
|
|
p_ptr->congested = 0;
|
|
|
|
if (wakeable)
|
|
|
|
p_ptr->wakeup(p_ptr);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case CONN_PROBE:
|
2011-06-01 20:21:12 +00:00
|
|
|
r_buf = port_build_proto_msg(p_ptr, CONN_PROBE_REPLY, 0);
|
2011-06-01 19:08:10 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* CONN_PROBE_REPLY or unrecognized - no action required */
|
|
|
|
break;
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
p_ptr->probing_state = CONFIRMED;
|
2011-06-01 19:08:10 +00:00
|
|
|
tipc_port_unlock(p_ptr);
|
2006-01-02 18:04:38 +00:00
|
|
|
exit:
|
2006-01-17 23:38:21 +00:00
|
|
|
tipc_net_route_msg(r_buf);
|
2011-11-04 17:24:29 +00:00
|
|
|
kfree_skb(buf);
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
|
2012-06-29 04:50:23 +00:00
|
|
|
static int port_print(struct tipc_port *p_ptr, char *buf, int len, int full_id)
|
2006-01-02 18:04:38 +00:00
|
|
|
{
|
2007-02-09 14:25:21 +00:00
|
|
|
struct publication *publ;
|
2012-06-29 04:50:23 +00:00
|
|
|
int ret;
|
2006-01-02 18:04:38 +00:00
|
|
|
|
|
|
|
if (full_id)
|
2012-06-29 04:50:23 +00:00
|
|
|
ret = tipc_snprintf(buf, len, "<%u.%u.%u:%u>:",
|
|
|
|
tipc_zone(tipc_own_addr),
|
|
|
|
tipc_cluster(tipc_own_addr),
|
|
|
|
tipc_node(tipc_own_addr), p_ptr->ref);
|
2006-01-02 18:04:38 +00:00
|
|
|
else
|
2012-06-29 04:50:23 +00:00
|
|
|
ret = tipc_snprintf(buf, len, "%-10u:", p_ptr->ref);
|
2006-01-02 18:04:38 +00:00
|
|
|
|
2011-01-07 16:43:40 +00:00
|
|
|
if (p_ptr->connected) {
|
2007-02-09 14:25:21 +00:00
|
|
|
u32 dport = port_peerport(p_ptr);
|
|
|
|
u32 destnode = port_peernode(p_ptr);
|
|
|
|
|
2012-06-29 04:50:23 +00:00
|
|
|
ret += tipc_snprintf(buf + ret, len - ret,
|
|
|
|
" connected to <%u.%u.%u:%u>",
|
|
|
|
tipc_zone(destnode),
|
|
|
|
tipc_cluster(destnode),
|
|
|
|
tipc_node(destnode), dport);
|
2011-01-07 16:43:40 +00:00
|
|
|
if (p_ptr->conn_type != 0)
|
2012-06-29 04:50:23 +00:00
|
|
|
ret += tipc_snprintf(buf + ret, len - ret,
|
|
|
|
" via {%u,%u}", p_ptr->conn_type,
|
|
|
|
p_ptr->conn_instance);
|
2011-01-07 16:43:40 +00:00
|
|
|
} else if (p_ptr->published) {
|
2012-06-29 04:50:23 +00:00
|
|
|
ret += tipc_snprintf(buf + ret, len - ret, " bound to");
|
2007-02-09 14:25:21 +00:00
|
|
|
list_for_each_entry(publ, &p_ptr->publications, pport_list) {
|
2006-01-02 18:04:38 +00:00
|
|
|
if (publ->lower == publ->upper)
|
2012-06-29 04:50:23 +00:00
|
|
|
ret += tipc_snprintf(buf + ret, len - ret,
|
|
|
|
" {%u,%u}", publ->type,
|
|
|
|
publ->lower);
|
2006-01-02 18:04:38 +00:00
|
|
|
else
|
2012-06-29 04:50:23 +00:00
|
|
|
ret += tipc_snprintf(buf + ret, len - ret,
|
|
|
|
" {%u,%u,%u}", publ->type,
|
|
|
|
publ->lower, publ->upper);
|
2007-02-09 14:25:21 +00:00
|
|
|
}
|
|
|
|
}
|
2012-06-29 04:50:23 +00:00
|
|
|
ret += tipc_snprintf(buf + ret, len - ret, "\n");
|
|
|
|
return ret;
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
|
2006-01-17 23:38:21 +00:00
|
|
|
struct sk_buff *tipc_port_get_ports(void)
|
2006-01-02 18:04:38 +00:00
|
|
|
{
|
|
|
|
struct sk_buff *buf;
|
|
|
|
struct tlv_desc *rep_tlv;
|
2012-06-29 04:50:23 +00:00
|
|
|
char *pb;
|
|
|
|
int pb_len;
|
2011-01-07 16:43:40 +00:00
|
|
|
struct tipc_port *p_ptr;
|
2012-06-29 04:50:23 +00:00
|
|
|
int str_len = 0;
|
2006-01-02 18:04:38 +00:00
|
|
|
|
2012-06-29 04:50:23 +00:00
|
|
|
buf = tipc_cfg_reply_alloc(TLV_SPACE(ULTRA_STRING_MAX_LEN));
|
2006-01-02 18:04:38 +00:00
|
|
|
if (!buf)
|
|
|
|
return NULL;
|
|
|
|
rep_tlv = (struct tlv_desc *)buf->data;
|
2012-06-29 04:50:23 +00:00
|
|
|
pb = TLV_DATA(rep_tlv);
|
|
|
|
pb_len = ULTRA_STRING_MAX_LEN;
|
2006-01-02 18:04:38 +00:00
|
|
|
|
2006-01-17 23:38:21 +00:00
|
|
|
spin_lock_bh(&tipc_port_list_lock);
|
2006-01-02 18:04:38 +00:00
|
|
|
list_for_each_entry(p_ptr, &ports, port_list) {
|
2011-01-07 16:43:40 +00:00
|
|
|
spin_lock_bh(p_ptr->lock);
|
2012-06-29 04:50:23 +00:00
|
|
|
str_len += port_print(p_ptr, pb, pb_len, 0);
|
2011-01-07 16:43:40 +00:00
|
|
|
spin_unlock_bh(p_ptr->lock);
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
2006-01-17 23:38:21 +00:00
|
|
|
spin_unlock_bh(&tipc_port_list_lock);
|
2012-06-29 04:50:23 +00:00
|
|
|
str_len += 1; /* for "\0" */
|
2006-01-02 18:04:38 +00:00
|
|
|
skb_put(buf, TLV_SPACE(str_len));
|
|
|
|
TLV_SET(rep_tlv, TIPC_TLV_ULTRA_STRING, NULL, str_len);
|
|
|
|
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
2006-01-17 23:38:21 +00:00
|
|
|
void tipc_port_reinit(void)
|
2006-01-02 18:04:38 +00:00
|
|
|
{
|
2011-01-07 16:43:40 +00:00
|
|
|
struct tipc_port *p_ptr;
|
2006-01-02 18:04:38 +00:00
|
|
|
struct tipc_msg *msg;
|
|
|
|
|
2006-01-17 23:38:21 +00:00
|
|
|
spin_lock_bh(&tipc_port_list_lock);
|
2006-01-02 18:04:38 +00:00
|
|
|
list_for_each_entry(p_ptr, &ports, port_list) {
|
2011-01-07 16:43:40 +00:00
|
|
|
msg = &p_ptr->phdr;
|
2008-05-21 21:54:12 +00:00
|
|
|
msg_set_prevnode(msg, tipc_own_addr);
|
2006-01-02 18:04:38 +00:00
|
|
|
msg_set_orignode(msg, tipc_own_addr);
|
|
|
|
}
|
2006-01-17 23:38:21 +00:00
|
|
|
spin_unlock_bh(&tipc_port_list_lock);
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void tipc_acknowledge(u32 ref, u32 ack)
|
|
|
|
{
|
2011-01-07 16:43:40 +00:00
|
|
|
struct tipc_port *p_ptr;
|
2006-03-21 06:36:47 +00:00
|
|
|
struct sk_buff *buf = NULL;
|
2006-01-02 18:04:38 +00:00
|
|
|
|
2006-01-17 23:38:21 +00:00
|
|
|
p_ptr = tipc_port_lock(ref);
|
2006-01-02 18:04:38 +00:00
|
|
|
if (!p_ptr)
|
|
|
|
return;
|
2011-01-07 16:43:40 +00:00
|
|
|
if (p_ptr->connected) {
|
|
|
|
p_ptr->conn_unacked -= ack;
|
2011-06-01 20:21:12 +00:00
|
|
|
buf = port_build_proto_msg(p_ptr, CONN_ACK, ack);
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
2006-01-17 23:38:21 +00:00
|
|
|
tipc_port_unlock(p_ptr);
|
|
|
|
tipc_net_route_msg(buf);
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int tipc_portimportance(u32 ref, unsigned int *importance)
|
|
|
|
{
|
2011-01-07 16:43:40 +00:00
|
|
|
struct tipc_port *p_ptr;
|
2007-02-09 14:25:21 +00:00
|
|
|
|
2006-01-17 23:38:21 +00:00
|
|
|
p_ptr = tipc_port_lock(ref);
|
2006-01-02 18:04:38 +00:00
|
|
|
if (!p_ptr)
|
|
|
|
return -EINVAL;
|
2011-01-07 16:43:40 +00:00
|
|
|
*importance = (unsigned int)msg_importance(&p_ptr->phdr);
|
2008-01-09 07:48:20 +00:00
|
|
|
tipc_port_unlock(p_ptr);
|
2008-07-15 05:44:01 +00:00
|
|
|
return 0;
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int tipc_set_portimportance(u32 ref, unsigned int imp)
|
|
|
|
{
|
2011-01-07 16:43:40 +00:00
|
|
|
struct tipc_port *p_ptr;
|
2006-01-02 18:04:38 +00:00
|
|
|
|
|
|
|
if (imp > TIPC_CRITICAL_IMPORTANCE)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2006-01-17 23:38:21 +00:00
|
|
|
p_ptr = tipc_port_lock(ref);
|
2006-01-02 18:04:38 +00:00
|
|
|
if (!p_ptr)
|
|
|
|
return -EINVAL;
|
2011-01-07 16:43:40 +00:00
|
|
|
msg_set_importance(&p_ptr->phdr, (u32)imp);
|
2008-01-09 07:48:20 +00:00
|
|
|
tipc_port_unlock(p_ptr);
|
2008-07-15 05:44:01 +00:00
|
|
|
return 0;
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int tipc_publish(u32 ref, unsigned int scope, struct tipc_name_seq const *seq)
|
|
|
|
{
|
2011-01-07 16:43:40 +00:00
|
|
|
struct tipc_port *p_ptr;
|
2006-01-02 18:04:38 +00:00
|
|
|
struct publication *publ;
|
|
|
|
u32 key;
|
|
|
|
int res = -EINVAL;
|
|
|
|
|
2006-01-17 23:38:21 +00:00
|
|
|
p_ptr = tipc_port_lock(ref);
|
2006-11-01 00:59:35 +00:00
|
|
|
if (!p_ptr)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2011-01-07 16:43:40 +00:00
|
|
|
if (p_ptr->connected)
|
2006-01-02 18:04:38 +00:00
|
|
|
goto exit;
|
|
|
|
key = ref + p_ptr->pub_count + 1;
|
|
|
|
if (key == ref) {
|
|
|
|
res = -EADDRINUSE;
|
|
|
|
goto exit;
|
|
|
|
}
|
2006-01-17 23:38:21 +00:00
|
|
|
publ = tipc_nametbl_publish(seq->type, seq->lower, seq->upper,
|
2011-01-07 16:43:40 +00:00
|
|
|
scope, p_ptr->ref, key);
|
2006-01-02 18:04:38 +00:00
|
|
|
if (publ) {
|
|
|
|
list_add(&publ->pport_list, &p_ptr->publications);
|
|
|
|
p_ptr->pub_count++;
|
2011-01-07 16:43:40 +00:00
|
|
|
p_ptr->published = 1;
|
2008-07-15 05:44:01 +00:00
|
|
|
res = 0;
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
exit:
|
2006-01-17 23:38:21 +00:00
|
|
|
tipc_port_unlock(p_ptr);
|
2006-01-02 18:04:38 +00:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
int tipc_withdraw(u32 ref, unsigned int scope, struct tipc_name_seq const *seq)
|
|
|
|
{
|
2011-01-07 16:43:40 +00:00
|
|
|
struct tipc_port *p_ptr;
|
2006-01-02 18:04:38 +00:00
|
|
|
struct publication *publ;
|
|
|
|
struct publication *tpubl;
|
|
|
|
int res = -EINVAL;
|
2007-02-09 14:25:21 +00:00
|
|
|
|
2006-01-17 23:38:21 +00:00
|
|
|
p_ptr = tipc_port_lock(ref);
|
2006-01-02 18:04:38 +00:00
|
|
|
if (!p_ptr)
|
|
|
|
return -EINVAL;
|
|
|
|
if (!seq) {
|
2007-02-09 14:25:21 +00:00
|
|
|
list_for_each_entry_safe(publ, tpubl,
|
2006-01-02 18:04:38 +00:00
|
|
|
&p_ptr->publications, pport_list) {
|
2007-02-09 14:25:21 +00:00
|
|
|
tipc_nametbl_withdraw(publ->type, publ->lower,
|
2006-01-17 23:38:21 +00:00
|
|
|
publ->ref, publ->key);
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
2008-07-15 05:44:01 +00:00
|
|
|
res = 0;
|
2006-01-02 18:04:38 +00:00
|
|
|
} else {
|
2007-02-09 14:25:21 +00:00
|
|
|
list_for_each_entry_safe(publ, tpubl,
|
2006-01-02 18:04:38 +00:00
|
|
|
&p_ptr->publications, pport_list) {
|
|
|
|
if (publ->scope != scope)
|
|
|
|
continue;
|
|
|
|
if (publ->type != seq->type)
|
|
|
|
continue;
|
|
|
|
if (publ->lower != seq->lower)
|
|
|
|
continue;
|
|
|
|
if (publ->upper != seq->upper)
|
|
|
|
break;
|
2007-02-09 14:25:21 +00:00
|
|
|
tipc_nametbl_withdraw(publ->type, publ->lower,
|
2006-01-17 23:38:21 +00:00
|
|
|
publ->ref, publ->key);
|
2008-07-15 05:44:01 +00:00
|
|
|
res = 0;
|
2006-01-02 18:04:38 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (list_empty(&p_ptr->publications))
|
2011-01-07 16:43:40 +00:00
|
|
|
p_ptr->published = 0;
|
2006-01-17 23:38:21 +00:00
|
|
|
tipc_port_unlock(p_ptr);
|
2006-01-02 18:04:38 +00:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
tipc: standardize across connect/disconnect function naming
Currently we have tipc_disconnect and tipc_disconnect_port. It is
not clear from the names alone, what they do or how they differ.
It turns out that tipc_disconnect just deals with the port locking
and then calls tipc_disconnect_port which does all the work.
If we rename as follows: tipc_disconnect_port --> __tipc_disconnect
then we will be following typical linux convention, where:
__tipc_disconnect: "raw" function that does all the work.
tipc_disconnect: wrapper that deals with locking and then calls
the real core __tipc_disconnect function
With this, the difference is immediately evident, and locking
violations are more apt to be spotted by chance while working on,
or even just while reading the code.
On the connect side of things, we currently only have the single
"tipc_connect2port" function. It does both the locking at enter/exit,
and the core of the work. Pending changes will make it desireable to
have the connect be a two part locking wrapper + worker function,
just like the disconnect is already.
Here, we make the connect look just like the updated disconnect case,
for the above reason, and for consistency. In the process, we also
get rid of the "2port" suffix that was on the original name, since
it adds no descriptive value.
On close examination, one might notice that the above connect
changes implicitly move the call to tipc_link_get_max_pkt() to be
within the scope of tipc_port_lock() protected region; when it was
not previously. We don't see any issues with this, and it is in
keeping with __tipc_connect doing the work and tipc_connect just
handling the locking.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2012-11-29 18:48:40 +00:00
|
|
|
int tipc_connect(u32 ref, struct tipc_portid const *peer)
|
2006-01-02 18:04:38 +00:00
|
|
|
{
|
2011-01-07 16:43:40 +00:00
|
|
|
struct tipc_port *p_ptr;
|
tipc: standardize across connect/disconnect function naming
Currently we have tipc_disconnect and tipc_disconnect_port. It is
not clear from the names alone, what they do or how they differ.
It turns out that tipc_disconnect just deals with the port locking
and then calls tipc_disconnect_port which does all the work.
If we rename as follows: tipc_disconnect_port --> __tipc_disconnect
then we will be following typical linux convention, where:
__tipc_disconnect: "raw" function that does all the work.
tipc_disconnect: wrapper that deals with locking and then calls
the real core __tipc_disconnect function
With this, the difference is immediately evident, and locking
violations are more apt to be spotted by chance while working on,
or even just while reading the code.
On the connect side of things, we currently only have the single
"tipc_connect2port" function. It does both the locking at enter/exit,
and the core of the work. Pending changes will make it desireable to
have the connect be a two part locking wrapper + worker function,
just like the disconnect is already.
Here, we make the connect look just like the updated disconnect case,
for the above reason, and for consistency. In the process, we also
get rid of the "2port" suffix that was on the original name, since
it adds no descriptive value.
On close examination, one might notice that the above connect
changes implicitly move the call to tipc_link_get_max_pkt() to be
within the scope of tipc_port_lock() protected region; when it was
not previously. We don't see any issues with this, and it is in
keeping with __tipc_connect doing the work and tipc_connect just
handling the locking.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2012-11-29 18:48:40 +00:00
|
|
|
int res;
|
2006-01-02 18:04:38 +00:00
|
|
|
|
2006-01-17 23:38:21 +00:00
|
|
|
p_ptr = tipc_port_lock(ref);
|
2006-01-02 18:04:38 +00:00
|
|
|
if (!p_ptr)
|
|
|
|
return -EINVAL;
|
tipc: standardize across connect/disconnect function naming
Currently we have tipc_disconnect and tipc_disconnect_port. It is
not clear from the names alone, what they do or how they differ.
It turns out that tipc_disconnect just deals with the port locking
and then calls tipc_disconnect_port which does all the work.
If we rename as follows: tipc_disconnect_port --> __tipc_disconnect
then we will be following typical linux convention, where:
__tipc_disconnect: "raw" function that does all the work.
tipc_disconnect: wrapper that deals with locking and then calls
the real core __tipc_disconnect function
With this, the difference is immediately evident, and locking
violations are more apt to be spotted by chance while working on,
or even just while reading the code.
On the connect side of things, we currently only have the single
"tipc_connect2port" function. It does both the locking at enter/exit,
and the core of the work. Pending changes will make it desireable to
have the connect be a two part locking wrapper + worker function,
just like the disconnect is already.
Here, we make the connect look just like the updated disconnect case,
for the above reason, and for consistency. In the process, we also
get rid of the "2port" suffix that was on the original name, since
it adds no descriptive value.
On close examination, one might notice that the above connect
changes implicitly move the call to tipc_link_get_max_pkt() to be
within the scope of tipc_port_lock() protected region; when it was
not previously. We don't see any issues with this, and it is in
keeping with __tipc_connect doing the work and tipc_connect just
handling the locking.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2012-11-29 18:48:40 +00:00
|
|
|
res = __tipc_connect(ref, p_ptr, peer);
|
|
|
|
tipc_port_unlock(p_ptr);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* __tipc_connect - connect to a remote peer
|
|
|
|
*
|
|
|
|
* Port must be locked.
|
|
|
|
*/
|
|
|
|
int __tipc_connect(u32 ref, struct tipc_port *p_ptr,
|
|
|
|
struct tipc_portid const *peer)
|
|
|
|
{
|
|
|
|
struct tipc_msg *msg;
|
|
|
|
int res = -EINVAL;
|
|
|
|
|
2011-01-07 16:43:40 +00:00
|
|
|
if (p_ptr->published || p_ptr->connected)
|
2006-01-02 18:04:38 +00:00
|
|
|
goto exit;
|
|
|
|
if (!peer->ref)
|
|
|
|
goto exit;
|
|
|
|
|
2011-01-07 16:43:40 +00:00
|
|
|
msg = &p_ptr->phdr;
|
2006-01-02 18:04:38 +00:00
|
|
|
msg_set_destnode(msg, peer->node);
|
|
|
|
msg_set_destport(msg, peer->ref);
|
|
|
|
msg_set_type(msg, TIPC_CONN_MSG);
|
2011-04-17 20:02:11 +00:00
|
|
|
msg_set_lookup_scope(msg, 0);
|
2010-12-31 18:59:17 +00:00
|
|
|
msg_set_hdr_sz(msg, SHORT_H_SIZE);
|
2006-01-02 18:04:38 +00:00
|
|
|
|
|
|
|
p_ptr->probing_interval = PROBING_INTERVAL;
|
|
|
|
p_ptr->probing_state = CONFIRMED;
|
2011-01-07 16:43:40 +00:00
|
|
|
p_ptr->connected = 1;
|
2006-01-02 18:04:38 +00:00
|
|
|
k_start_timer(&p_ptr->timer, p_ptr->probing_interval);
|
|
|
|
|
2010-12-31 18:59:32 +00:00
|
|
|
tipc_nodesub_subscribe(&p_ptr->subscription, peer->node,
|
2006-01-12 21:22:32 +00:00
|
|
|
(void *)(unsigned long)ref,
|
2006-01-02 18:04:38 +00:00
|
|
|
(net_ev_handler)port_handle_node_down);
|
2008-07-15 05:44:01 +00:00
|
|
|
res = 0;
|
2006-01-02 18:04:38 +00:00
|
|
|
exit:
|
2011-01-07 16:43:40 +00:00
|
|
|
p_ptr->max_pkt = tipc_link_get_max_pkt(peer->node, ref);
|
2006-01-02 18:04:38 +00:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
tipc: standardize across connect/disconnect function naming
Currently we have tipc_disconnect and tipc_disconnect_port. It is
not clear from the names alone, what they do or how they differ.
It turns out that tipc_disconnect just deals with the port locking
and then calls tipc_disconnect_port which does all the work.
If we rename as follows: tipc_disconnect_port --> __tipc_disconnect
then we will be following typical linux convention, where:
__tipc_disconnect: "raw" function that does all the work.
tipc_disconnect: wrapper that deals with locking and then calls
the real core __tipc_disconnect function
With this, the difference is immediately evident, and locking
violations are more apt to be spotted by chance while working on,
or even just while reading the code.
On the connect side of things, we currently only have the single
"tipc_connect2port" function. It does both the locking at enter/exit,
and the core of the work. Pending changes will make it desireable to
have the connect be a two part locking wrapper + worker function,
just like the disconnect is already.
Here, we make the connect look just like the updated disconnect case,
for the above reason, and for consistency. In the process, we also
get rid of the "2port" suffix that was on the original name, since
it adds no descriptive value.
On close examination, one might notice that the above connect
changes implicitly move the call to tipc_link_get_max_pkt() to be
within the scope of tipc_port_lock() protected region; when it was
not previously. We don't see any issues with this, and it is in
keeping with __tipc_connect doing the work and tipc_connect just
handling the locking.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2012-11-29 18:48:40 +00:00
|
|
|
/*
|
|
|
|
* __tipc_disconnect - disconnect port from peer
|
2008-04-15 07:22:02 +00:00
|
|
|
*
|
|
|
|
* Port must be locked.
|
|
|
|
*/
|
tipc: standardize across connect/disconnect function naming
Currently we have tipc_disconnect and tipc_disconnect_port. It is
not clear from the names alone, what they do or how they differ.
It turns out that tipc_disconnect just deals with the port locking
and then calls tipc_disconnect_port which does all the work.
If we rename as follows: tipc_disconnect_port --> __tipc_disconnect
then we will be following typical linux convention, where:
__tipc_disconnect: "raw" function that does all the work.
tipc_disconnect: wrapper that deals with locking and then calls
the real core __tipc_disconnect function
With this, the difference is immediately evident, and locking
violations are more apt to be spotted by chance while working on,
or even just while reading the code.
On the connect side of things, we currently only have the single
"tipc_connect2port" function. It does both the locking at enter/exit,
and the core of the work. Pending changes will make it desireable to
have the connect be a two part locking wrapper + worker function,
just like the disconnect is already.
Here, we make the connect look just like the updated disconnect case,
for the above reason, and for consistency. In the process, we also
get rid of the "2port" suffix that was on the original name, since
it adds no descriptive value.
On close examination, one might notice that the above connect
changes implicitly move the call to tipc_link_get_max_pkt() to be
within the scope of tipc_port_lock() protected region; when it was
not previously. We don't see any issues with this, and it is in
keeping with __tipc_connect doing the work and tipc_connect just
handling the locking.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2012-11-29 18:48:40 +00:00
|
|
|
int __tipc_disconnect(struct tipc_port *tp_ptr)
|
2008-04-15 07:22:02 +00:00
|
|
|
{
|
|
|
|
int res;
|
|
|
|
|
|
|
|
if (tp_ptr->connected) {
|
|
|
|
tp_ptr->connected = 0;
|
|
|
|
/* let timer expire on it's own to avoid deadlock! */
|
2012-06-03 17:41:40 +00:00
|
|
|
tipc_nodesub_unsubscribe(&tp_ptr->subscription);
|
2008-07-15 05:44:01 +00:00
|
|
|
res = 0;
|
2008-04-15 07:22:02 +00:00
|
|
|
} else {
|
|
|
|
res = -ENOTCONN;
|
|
|
|
}
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2006-01-02 18:04:38 +00:00
|
|
|
/*
|
|
|
|
* tipc_disconnect(): Disconnect port form peer.
|
|
|
|
* This is a node local operation.
|
|
|
|
*/
|
|
|
|
int tipc_disconnect(u32 ref)
|
|
|
|
{
|
2011-01-07 16:43:40 +00:00
|
|
|
struct tipc_port *p_ptr;
|
2008-04-15 07:22:02 +00:00
|
|
|
int res;
|
2006-01-02 18:04:38 +00:00
|
|
|
|
2006-01-17 23:38:21 +00:00
|
|
|
p_ptr = tipc_port_lock(ref);
|
2006-01-02 18:04:38 +00:00
|
|
|
if (!p_ptr)
|
|
|
|
return -EINVAL;
|
tipc: standardize across connect/disconnect function naming
Currently we have tipc_disconnect and tipc_disconnect_port. It is
not clear from the names alone, what they do or how they differ.
It turns out that tipc_disconnect just deals with the port locking
and then calls tipc_disconnect_port which does all the work.
If we rename as follows: tipc_disconnect_port --> __tipc_disconnect
then we will be following typical linux convention, where:
__tipc_disconnect: "raw" function that does all the work.
tipc_disconnect: wrapper that deals with locking and then calls
the real core __tipc_disconnect function
With this, the difference is immediately evident, and locking
violations are more apt to be spotted by chance while working on,
or even just while reading the code.
On the connect side of things, we currently only have the single
"tipc_connect2port" function. It does both the locking at enter/exit,
and the core of the work. Pending changes will make it desireable to
have the connect be a two part locking wrapper + worker function,
just like the disconnect is already.
Here, we make the connect look just like the updated disconnect case,
for the above reason, and for consistency. In the process, we also
get rid of the "2port" suffix that was on the original name, since
it adds no descriptive value.
On close examination, one might notice that the above connect
changes implicitly move the call to tipc_link_get_max_pkt() to be
within the scope of tipc_port_lock() protected region; when it was
not previously. We don't see any issues with this, and it is in
keeping with __tipc_connect doing the work and tipc_connect just
handling the locking.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2012-11-29 18:48:40 +00:00
|
|
|
res = __tipc_disconnect(p_ptr);
|
2006-01-17 23:38:21 +00:00
|
|
|
tipc_port_unlock(p_ptr);
|
2006-01-02 18:04:38 +00:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* tipc_shutdown(): Send a SHUTDOWN msg to peer and disconnect
|
|
|
|
*/
|
|
|
|
int tipc_shutdown(u32 ref)
|
|
|
|
{
|
2011-01-07 16:43:40 +00:00
|
|
|
struct tipc_port *p_ptr;
|
2006-03-21 06:36:47 +00:00
|
|
|
struct sk_buff *buf = NULL;
|
2006-01-02 18:04:38 +00:00
|
|
|
|
2006-01-17 23:38:21 +00:00
|
|
|
p_ptr = tipc_port_lock(ref);
|
2006-01-02 18:04:38 +00:00
|
|
|
if (!p_ptr)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2011-05-31 20:10:08 +00:00
|
|
|
buf = port_build_peer_abort_msg(p_ptr, TIPC_CONN_SHUTDOWN);
|
2006-01-17 23:38:21 +00:00
|
|
|
tipc_port_unlock(p_ptr);
|
|
|
|
tipc_net_route_msg(buf);
|
2006-01-02 18:04:38 +00:00
|
|
|
return tipc_disconnect(ref);
|
|
|
|
}
|
|
|
|
|
2011-11-09 18:29:18 +00:00
|
|
|
/**
|
|
|
|
* tipc_port_recv_msg - receive message from lower layer and deliver to port user
|
|
|
|
*/
|
|
|
|
int tipc_port_recv_msg(struct sk_buff *buf)
|
|
|
|
{
|
|
|
|
struct tipc_port *p_ptr;
|
|
|
|
struct tipc_msg *msg = buf_msg(buf);
|
|
|
|
u32 destport = msg_destport(msg);
|
|
|
|
u32 dsz = msg_data_sz(msg);
|
|
|
|
u32 err;
|
|
|
|
|
|
|
|
/* forward unresolved named message */
|
|
|
|
if (unlikely(!destport)) {
|
|
|
|
tipc_net_route_msg(buf);
|
|
|
|
return dsz;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* validate destination & pass to port, otherwise reject message */
|
|
|
|
p_ptr = tipc_port_lock(destport);
|
|
|
|
if (likely(p_ptr)) {
|
|
|
|
err = p_ptr->dispatcher(p_ptr, buf);
|
|
|
|
tipc_port_unlock(p_ptr);
|
|
|
|
if (likely(!err))
|
|
|
|
return dsz;
|
|
|
|
} else {
|
|
|
|
err = TIPC_ERR_NO_PORT;
|
|
|
|
}
|
2012-04-17 22:42:28 +00:00
|
|
|
|
2011-11-09 18:29:18 +00:00
|
|
|
return tipc_reject_msg(buf, err);
|
|
|
|
}
|
|
|
|
|
2006-01-02 18:04:38 +00:00
|
|
|
/*
|
2006-01-17 23:38:21 +00:00
|
|
|
* tipc_port_recv_sections(): Concatenate and deliver sectioned
|
2006-01-02 18:04:38 +00:00
|
|
|
* message for this node.
|
|
|
|
*/
|
2011-01-07 16:43:40 +00:00
|
|
|
static int tipc_port_recv_sections(struct tipc_port *sender, unsigned int num_sect,
|
tipc: Avoid recomputation of outgoing message length
Rework TIPC's message sending routines to take advantage of the total
amount of data value passed to it by the kernel socket infrastructure.
This change eliminates the need for TIPC to compute the size of outgoing
messages itself, as well as the check for an oversize message in
tipc_msg_build(). In addition, this change warrants an explanation:
- res = send_packet(NULL, sock, &my_msg, 0);
+ res = send_packet(NULL, sock, &my_msg, bytes_to_send);
Previously, the final argument to send_packet() was ignored (since the
amount of data being sent was recalculated by a lower-level routine)
and we could just pass in a dummy value (0). Now that the
recalculation is being eliminated, the argument value being passed to
send_packet() is significant and we have to supply the actual amount
of data we want to send.
Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2011-04-21 15:42:07 +00:00
|
|
|
struct iovec const *msg_sect,
|
|
|
|
unsigned int total_len)
|
2006-01-02 18:04:38 +00:00
|
|
|
{
|
|
|
|
struct sk_buff *buf;
|
|
|
|
int res;
|
2007-02-09 14:25:21 +00:00
|
|
|
|
tipc: Avoid recomputation of outgoing message length
Rework TIPC's message sending routines to take advantage of the total
amount of data value passed to it by the kernel socket infrastructure.
This change eliminates the need for TIPC to compute the size of outgoing
messages itself, as well as the check for an oversize message in
tipc_msg_build(). In addition, this change warrants an explanation:
- res = send_packet(NULL, sock, &my_msg, 0);
+ res = send_packet(NULL, sock, &my_msg, bytes_to_send);
Previously, the final argument to send_packet() was ignored (since the
amount of data being sent was recalculated by a lower-level routine)
and we could just pass in a dummy value (0). Now that the
recalculation is being eliminated, the argument value being passed to
send_packet() is significant and we have to supply the actual amount
of data we want to send.
Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2011-04-21 15:42:07 +00:00
|
|
|
res = tipc_msg_build(&sender->phdr, msg_sect, num_sect, total_len,
|
2013-06-17 14:54:43 +00:00
|
|
|
MAX_MSG_SIZE, &buf);
|
2006-01-02 18:04:38 +00:00
|
|
|
if (likely(buf))
|
2006-01-17 23:38:21 +00:00
|
|
|
tipc_port_recv_msg(buf);
|
2006-01-02 18:04:38 +00:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* tipc_send - send message sections on connection
|
|
|
|
*/
|
tipc: Avoid recomputation of outgoing message length
Rework TIPC's message sending routines to take advantage of the total
amount of data value passed to it by the kernel socket infrastructure.
This change eliminates the need for TIPC to compute the size of outgoing
messages itself, as well as the check for an oversize message in
tipc_msg_build(). In addition, this change warrants an explanation:
- res = send_packet(NULL, sock, &my_msg, 0);
+ res = send_packet(NULL, sock, &my_msg, bytes_to_send);
Previously, the final argument to send_packet() was ignored (since the
amount of data being sent was recalculated by a lower-level routine)
and we could just pass in a dummy value (0). Now that the
recalculation is being eliminated, the argument value being passed to
send_packet() is significant and we have to supply the actual amount
of data we want to send.
Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2011-04-21 15:42:07 +00:00
|
|
|
int tipc_send(u32 ref, unsigned int num_sect, struct iovec const *msg_sect,
|
|
|
|
unsigned int total_len)
|
2006-01-02 18:04:38 +00:00
|
|
|
{
|
2011-01-07 16:43:40 +00:00
|
|
|
struct tipc_port *p_ptr;
|
2006-01-02 18:04:38 +00:00
|
|
|
u32 destnode;
|
|
|
|
int res;
|
|
|
|
|
2006-01-17 23:38:21 +00:00
|
|
|
p_ptr = tipc_port_deref(ref);
|
2011-01-07 16:43:40 +00:00
|
|
|
if (!p_ptr || !p_ptr->connected)
|
2006-01-02 18:04:38 +00:00
|
|
|
return -EINVAL;
|
|
|
|
|
2011-01-07 16:43:40 +00:00
|
|
|
p_ptr->congested = 1;
|
2006-01-17 23:38:21 +00:00
|
|
|
if (!tipc_port_congested(p_ptr)) {
|
2006-01-02 18:04:38 +00:00
|
|
|
destnode = port_peernode(p_ptr);
|
2012-04-18 13:27:22 +00:00
|
|
|
if (likely(!in_own_node(destnode)))
|
2006-01-17 23:38:21 +00:00
|
|
|
res = tipc_link_send_sections_fast(p_ptr, msg_sect, num_sect,
|
tipc: Avoid recomputation of outgoing message length
Rework TIPC's message sending routines to take advantage of the total
amount of data value passed to it by the kernel socket infrastructure.
This change eliminates the need for TIPC to compute the size of outgoing
messages itself, as well as the check for an oversize message in
tipc_msg_build(). In addition, this change warrants an explanation:
- res = send_packet(NULL, sock, &my_msg, 0);
+ res = send_packet(NULL, sock, &my_msg, bytes_to_send);
Previously, the final argument to send_packet() was ignored (since the
amount of data being sent was recalculated by a lower-level routine)
and we could just pass in a dummy value (0). Now that the
recalculation is being eliminated, the argument value being passed to
send_packet() is significant and we have to supply the actual amount
of data we want to send.
Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2011-04-21 15:42:07 +00:00
|
|
|
total_len, destnode);
|
2006-01-02 18:04:38 +00:00
|
|
|
else
|
tipc: Avoid recomputation of outgoing message length
Rework TIPC's message sending routines to take advantage of the total
amount of data value passed to it by the kernel socket infrastructure.
This change eliminates the need for TIPC to compute the size of outgoing
messages itself, as well as the check for an oversize message in
tipc_msg_build(). In addition, this change warrants an explanation:
- res = send_packet(NULL, sock, &my_msg, 0);
+ res = send_packet(NULL, sock, &my_msg, bytes_to_send);
Previously, the final argument to send_packet() was ignored (since the
amount of data being sent was recalculated by a lower-level routine)
and we could just pass in a dummy value (0). Now that the
recalculation is being eliminated, the argument value being passed to
send_packet() is significant and we have to supply the actual amount
of data we want to send.
Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2011-04-21 15:42:07 +00:00
|
|
|
res = tipc_port_recv_sections(p_ptr, num_sect, msg_sect,
|
|
|
|
total_len);
|
2006-01-02 18:04:38 +00:00
|
|
|
|
|
|
|
if (likely(res != -ELINKCONG)) {
|
2011-01-07 16:43:40 +00:00
|
|
|
p_ptr->congested = 0;
|
2011-01-24 20:02:14 +00:00
|
|
|
if (res > 0)
|
|
|
|
p_ptr->sent++;
|
2006-01-02 18:04:38 +00:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (port_unreliable(p_ptr)) {
|
2011-01-07 16:43:40 +00:00
|
|
|
p_ptr->congested = 0;
|
tipc: Avoid recomputation of outgoing message length
Rework TIPC's message sending routines to take advantage of the total
amount of data value passed to it by the kernel socket infrastructure.
This change eliminates the need for TIPC to compute the size of outgoing
messages itself, as well as the check for an oversize message in
tipc_msg_build(). In addition, this change warrants an explanation:
- res = send_packet(NULL, sock, &my_msg, 0);
+ res = send_packet(NULL, sock, &my_msg, bytes_to_send);
Previously, the final argument to send_packet() was ignored (since the
amount of data being sent was recalculated by a lower-level routine)
and we could just pass in a dummy value (0). Now that the
recalculation is being eliminated, the argument value being passed to
send_packet() is significant and we have to supply the actual amount
of data we want to send.
Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2011-04-21 15:42:07 +00:00
|
|
|
return total_len;
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
return -ELINKCONG;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2010-11-30 12:01:02 +00:00
|
|
|
* tipc_send2name - send message sections to port name
|
2006-01-02 18:04:38 +00:00
|
|
|
*/
|
2010-11-30 12:01:02 +00:00
|
|
|
int tipc_send2name(u32 ref, struct tipc_name const *name, unsigned int domain,
|
tipc: Avoid recomputation of outgoing message length
Rework TIPC's message sending routines to take advantage of the total
amount of data value passed to it by the kernel socket infrastructure.
This change eliminates the need for TIPC to compute the size of outgoing
messages itself, as well as the check for an oversize message in
tipc_msg_build(). In addition, this change warrants an explanation:
- res = send_packet(NULL, sock, &my_msg, 0);
+ res = send_packet(NULL, sock, &my_msg, bytes_to_send);
Previously, the final argument to send_packet() was ignored (since the
amount of data being sent was recalculated by a lower-level routine)
and we could just pass in a dummy value (0). Now that the
recalculation is being eliminated, the argument value being passed to
send_packet() is significant and we have to supply the actual amount
of data we want to send.
Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2011-04-21 15:42:07 +00:00
|
|
|
unsigned int num_sect, struct iovec const *msg_sect,
|
|
|
|
unsigned int total_len)
|
2006-01-02 18:04:38 +00:00
|
|
|
{
|
2011-01-07 16:43:40 +00:00
|
|
|
struct tipc_port *p_ptr;
|
2006-01-02 18:04:38 +00:00
|
|
|
struct tipc_msg *msg;
|
|
|
|
u32 destnode = domain;
|
2010-05-11 14:30:06 +00:00
|
|
|
u32 destport;
|
2006-01-02 18:04:38 +00:00
|
|
|
int res;
|
|
|
|
|
2006-01-17 23:38:21 +00:00
|
|
|
p_ptr = tipc_port_deref(ref);
|
2011-01-07 16:43:40 +00:00
|
|
|
if (!p_ptr || p_ptr->connected)
|
2006-01-02 18:04:38 +00:00
|
|
|
return -EINVAL;
|
|
|
|
|
2011-01-07 16:43:40 +00:00
|
|
|
msg = &p_ptr->phdr;
|
2006-01-02 18:04:38 +00:00
|
|
|
msg_set_type(msg, TIPC_NAMED_MSG);
|
2011-05-31 19:03:18 +00:00
|
|
|
msg_set_hdr_sz(msg, NAMED_H_SIZE);
|
2006-01-02 18:04:38 +00:00
|
|
|
msg_set_nametype(msg, name->type);
|
|
|
|
msg_set_nameinst(msg, name->instance);
|
2010-05-11 14:30:12 +00:00
|
|
|
msg_set_lookup_scope(msg, tipc_addr_scope(domain));
|
2006-01-17 23:38:21 +00:00
|
|
|
destport = tipc_nametbl_translate(name->type, name->instance, &destnode);
|
2006-01-02 18:04:38 +00:00
|
|
|
msg_set_destnode(msg, destnode);
|
|
|
|
msg_set_destport(msg, destport);
|
|
|
|
|
2011-11-07 22:00:54 +00:00
|
|
|
if (likely(destport || destnode)) {
|
2012-04-18 13:27:22 +00:00
|
|
|
if (likely(in_own_node(destnode)))
|
2011-01-24 20:02:14 +00:00
|
|
|
res = tipc_port_recv_sections(p_ptr, num_sect,
|
tipc: Avoid recomputation of outgoing message length
Rework TIPC's message sending routines to take advantage of the total
amount of data value passed to it by the kernel socket infrastructure.
This change eliminates the need for TIPC to compute the size of outgoing
messages itself, as well as the check for an oversize message in
tipc_msg_build(). In addition, this change warrants an explanation:
- res = send_packet(NULL, sock, &my_msg, 0);
+ res = send_packet(NULL, sock, &my_msg, bytes_to_send);
Previously, the final argument to send_packet() was ignored (since the
amount of data being sent was recalculated by a lower-level routine)
and we could just pass in a dummy value (0). Now that the
recalculation is being eliminated, the argument value being passed to
send_packet() is significant and we have to supply the actual amount
of data we want to send.
Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2011-04-21 15:42:07 +00:00
|
|
|
msg_sect, total_len);
|
2012-04-18 13:22:56 +00:00
|
|
|
else if (tipc_own_addr)
|
2011-01-24 20:02:14 +00:00
|
|
|
res = tipc_link_send_sections_fast(p_ptr, msg_sect,
|
tipc: Avoid recomputation of outgoing message length
Rework TIPC's message sending routines to take advantage of the total
amount of data value passed to it by the kernel socket infrastructure.
This change eliminates the need for TIPC to compute the size of outgoing
messages itself, as well as the check for an oversize message in
tipc_msg_build(). In addition, this change warrants an explanation:
- res = send_packet(NULL, sock, &my_msg, 0);
+ res = send_packet(NULL, sock, &my_msg, bytes_to_send);
Previously, the final argument to send_packet() was ignored (since the
amount of data being sent was recalculated by a lower-level routine)
and we could just pass in a dummy value (0). Now that the
recalculation is being eliminated, the argument value being passed to
send_packet() is significant and we have to supply the actual amount
of data we want to send.
Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2011-04-21 15:42:07 +00:00
|
|
|
num_sect, total_len,
|
|
|
|
destnode);
|
2012-04-18 13:22:56 +00:00
|
|
|
else
|
|
|
|
res = tipc_port_reject_sections(p_ptr, msg, msg_sect,
|
|
|
|
num_sect, total_len,
|
|
|
|
TIPC_ERR_NO_NODE);
|
2011-01-24 20:02:14 +00:00
|
|
|
if (likely(res != -ELINKCONG)) {
|
|
|
|
if (res > 0)
|
|
|
|
p_ptr->sent++;
|
2006-01-02 18:04:38 +00:00
|
|
|
return res;
|
2011-01-24 20:02:14 +00:00
|
|
|
}
|
2006-01-02 18:04:38 +00:00
|
|
|
if (port_unreliable(p_ptr)) {
|
tipc: Avoid recomputation of outgoing message length
Rework TIPC's message sending routines to take advantage of the total
amount of data value passed to it by the kernel socket infrastructure.
This change eliminates the need for TIPC to compute the size of outgoing
messages itself, as well as the check for an oversize message in
tipc_msg_build(). In addition, this change warrants an explanation:
- res = send_packet(NULL, sock, &my_msg, 0);
+ res = send_packet(NULL, sock, &my_msg, bytes_to_send);
Previously, the final argument to send_packet() was ignored (since the
amount of data being sent was recalculated by a lower-level routine)
and we could just pass in a dummy value (0). Now that the
recalculation is being eliminated, the argument value being passed to
send_packet() is significant and we have to supply the actual amount
of data we want to send.
Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2011-04-21 15:42:07 +00:00
|
|
|
return total_len;
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
return -ELINKCONG;
|
|
|
|
}
|
2007-02-09 14:25:21 +00:00
|
|
|
return tipc_port_reject_sections(p_ptr, msg, msg_sect, num_sect,
|
tipc: Avoid recomputation of outgoing message length
Rework TIPC's message sending routines to take advantage of the total
amount of data value passed to it by the kernel socket infrastructure.
This change eliminates the need for TIPC to compute the size of outgoing
messages itself, as well as the check for an oversize message in
tipc_msg_build(). In addition, this change warrants an explanation:
- res = send_packet(NULL, sock, &my_msg, 0);
+ res = send_packet(NULL, sock, &my_msg, bytes_to_send);
Previously, the final argument to send_packet() was ignored (since the
amount of data being sent was recalculated by a lower-level routine)
and we could just pass in a dummy value (0). Now that the
recalculation is being eliminated, the argument value being passed to
send_packet() is significant and we have to supply the actual amount
of data we want to send.
Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2011-04-21 15:42:07 +00:00
|
|
|
total_len, TIPC_ERR_NO_NAME);
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2010-11-30 12:01:02 +00:00
|
|
|
* tipc_send2port - send message sections to port identity
|
2006-01-02 18:04:38 +00:00
|
|
|
*/
|
2010-11-30 12:01:02 +00:00
|
|
|
int tipc_send2port(u32 ref, struct tipc_portid const *dest,
|
tipc: Avoid recomputation of outgoing message length
Rework TIPC's message sending routines to take advantage of the total
amount of data value passed to it by the kernel socket infrastructure.
This change eliminates the need for TIPC to compute the size of outgoing
messages itself, as well as the check for an oversize message in
tipc_msg_build(). In addition, this change warrants an explanation:
- res = send_packet(NULL, sock, &my_msg, 0);
+ res = send_packet(NULL, sock, &my_msg, bytes_to_send);
Previously, the final argument to send_packet() was ignored (since the
amount of data being sent was recalculated by a lower-level routine)
and we could just pass in a dummy value (0). Now that the
recalculation is being eliminated, the argument value being passed to
send_packet() is significant and we have to supply the actual amount
of data we want to send.
Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2011-04-21 15:42:07 +00:00
|
|
|
unsigned int num_sect, struct iovec const *msg_sect,
|
|
|
|
unsigned int total_len)
|
2006-01-02 18:04:38 +00:00
|
|
|
{
|
2011-01-07 16:43:40 +00:00
|
|
|
struct tipc_port *p_ptr;
|
2006-01-02 18:04:38 +00:00
|
|
|
struct tipc_msg *msg;
|
|
|
|
int res;
|
|
|
|
|
2006-01-17 23:38:21 +00:00
|
|
|
p_ptr = tipc_port_deref(ref);
|
2011-01-07 16:43:40 +00:00
|
|
|
if (!p_ptr || p_ptr->connected)
|
2006-01-02 18:04:38 +00:00
|
|
|
return -EINVAL;
|
|
|
|
|
2011-01-07 16:43:40 +00:00
|
|
|
msg = &p_ptr->phdr;
|
2006-01-02 18:04:38 +00:00
|
|
|
msg_set_type(msg, TIPC_DIRECT_MSG);
|
2011-04-17 20:02:11 +00:00
|
|
|
msg_set_lookup_scope(msg, 0);
|
2006-01-02 18:04:38 +00:00
|
|
|
msg_set_destnode(msg, dest->node);
|
|
|
|
msg_set_destport(msg, dest->ref);
|
2011-05-31 19:03:18 +00:00
|
|
|
msg_set_hdr_sz(msg, BASIC_H_SIZE);
|
2011-01-24 20:02:14 +00:00
|
|
|
|
2012-04-18 13:27:22 +00:00
|
|
|
if (in_own_node(dest->node))
|
tipc: Avoid recomputation of outgoing message length
Rework TIPC's message sending routines to take advantage of the total
amount of data value passed to it by the kernel socket infrastructure.
This change eliminates the need for TIPC to compute the size of outgoing
messages itself, as well as the check for an oversize message in
tipc_msg_build(). In addition, this change warrants an explanation:
- res = send_packet(NULL, sock, &my_msg, 0);
+ res = send_packet(NULL, sock, &my_msg, bytes_to_send);
Previously, the final argument to send_packet() was ignored (since the
amount of data being sent was recalculated by a lower-level routine)
and we could just pass in a dummy value (0). Now that the
recalculation is being eliminated, the argument value being passed to
send_packet() is significant and we have to supply the actual amount
of data we want to send.
Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2011-04-21 15:42:07 +00:00
|
|
|
res = tipc_port_recv_sections(p_ptr, num_sect, msg_sect,
|
|
|
|
total_len);
|
2012-04-18 13:22:56 +00:00
|
|
|
else if (tipc_own_addr)
|
2011-01-24 20:02:14 +00:00
|
|
|
res = tipc_link_send_sections_fast(p_ptr, msg_sect, num_sect,
|
tipc: Avoid recomputation of outgoing message length
Rework TIPC's message sending routines to take advantage of the total
amount of data value passed to it by the kernel socket infrastructure.
This change eliminates the need for TIPC to compute the size of outgoing
messages itself, as well as the check for an oversize message in
tipc_msg_build(). In addition, this change warrants an explanation:
- res = send_packet(NULL, sock, &my_msg, 0);
+ res = send_packet(NULL, sock, &my_msg, bytes_to_send);
Previously, the final argument to send_packet() was ignored (since the
amount of data being sent was recalculated by a lower-level routine)
and we could just pass in a dummy value (0). Now that the
recalculation is being eliminated, the argument value being passed to
send_packet() is significant and we have to supply the actual amount
of data we want to send.
Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2011-04-21 15:42:07 +00:00
|
|
|
total_len, dest->node);
|
2012-04-18 13:22:56 +00:00
|
|
|
else
|
|
|
|
res = tipc_port_reject_sections(p_ptr, msg, msg_sect, num_sect,
|
|
|
|
total_len, TIPC_ERR_NO_NODE);
|
2011-01-24 20:02:14 +00:00
|
|
|
if (likely(res != -ELINKCONG)) {
|
|
|
|
if (res > 0)
|
|
|
|
p_ptr->sent++;
|
2006-01-02 18:04:38 +00:00
|
|
|
return res;
|
2011-01-24 20:02:14 +00:00
|
|
|
}
|
2006-01-02 18:04:38 +00:00
|
|
|
if (port_unreliable(p_ptr)) {
|
tipc: Avoid recomputation of outgoing message length
Rework TIPC's message sending routines to take advantage of the total
amount of data value passed to it by the kernel socket infrastructure.
This change eliminates the need for TIPC to compute the size of outgoing
messages itself, as well as the check for an oversize message in
tipc_msg_build(). In addition, this change warrants an explanation:
- res = send_packet(NULL, sock, &my_msg, 0);
+ res = send_packet(NULL, sock, &my_msg, bytes_to_send);
Previously, the final argument to send_packet() was ignored (since the
amount of data being sent was recalculated by a lower-level routine)
and we could just pass in a dummy value (0). Now that the
recalculation is being eliminated, the argument value being passed to
send_packet() is significant and we have to supply the actual amount
of data we want to send.
Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2011-04-21 15:42:07 +00:00
|
|
|
return total_len;
|
2006-01-02 18:04:38 +00:00
|
|
|
}
|
|
|
|
return -ELINKCONG;
|
|
|
|
}
|