mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-25 05:34:00 +08:00
d88dca79d3
Remove htohl implementation from tipc I was working on forward porting the downstream commits for TIPC and ran accross this one: http://tipc.cslab.ericsson.net/cgi-bin/gitweb.cgi?p=people/allan/tipc.git;a=commitdiff;h=894279b9437b63cbb02405ad5b8e033b51e4e31e I was going to just take it, when I looked closer and noted what it was doing. This is basically a routine to byte swap fields of data in sent/received packets for tipc, dependent upon the receivers guessed endianness of the peer when a connection is established. Asside from just seeming silly to me, it appears to violate the latest RFC draft for tipc: http://tipc.sourceforge.net/doc/draft-spec-tipc-02.txt Which, according to section 4.2 and 4.3.3, requires that all fields of all commands be sent in network byte order. So instead of just taking this patch, instead I'm removing the htohl function and replacing the calls with calls to ntohl in the rx path and htonl in the send path. As part of this fix, I'm also changing the subscr_cancel function, which searches the list of subscribers, using a memcmp of the entire subscriber list, for the entry to tear down. unfortunately it memcmps the entire tipc_subscr structure which has several bits that are private to the local side, so nothing will ever match. section 5.2 of the draft spec indicates the <type,upper,lower> tuple should uniquely identify a subscriber, so convert subscr_cancel to just match on those fields (properly endian swapped). I've tested this using the tipc test suite, and its passed without issue. Signed-off-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
89 lines
3.2 KiB
C
89 lines
3.2 KiB
C
/*
|
|
* net/tipc/subscr.h: Include file for TIPC network topology service
|
|
*
|
|
* Copyright (c) 2003-2006, Ericsson AB
|
|
* Copyright (c) 2005-2007, Wind River Systems
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
*
|
|
* 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.
|
|
*
|
|
* 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
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#ifndef _TIPC_SUBSCR_H
|
|
#define _TIPC_SUBSCR_H
|
|
|
|
struct subscription;
|
|
|
|
typedef void (*tipc_subscr_event) (struct subscription *sub,
|
|
u32 found_lower, u32 found_upper,
|
|
u32 event, u32 port_ref, u32 node);
|
|
|
|
/**
|
|
* struct subscription - TIPC network topology subscription object
|
|
* @seq: name sequence associated with subscription
|
|
* @timeout: duration of subscription (in ms)
|
|
* @filter: event filtering to be done for subscription
|
|
* @event_cb: routine invoked when a subscription event is detected
|
|
* @timer: timer governing subscription duration (optional)
|
|
* @nameseq_list: adjacent subscriptions in name sequence's subscription list
|
|
* @subscription_list: adjacent subscriptions in subscriber's subscription list
|
|
* @server_ref: object reference of server port associated with subscription
|
|
* @evt: template for events generated by subscription
|
|
*/
|
|
|
|
struct subscription {
|
|
struct tipc_name_seq seq;
|
|
u32 timeout;
|
|
u32 filter;
|
|
tipc_subscr_event event_cb;
|
|
struct timer_list timer;
|
|
struct list_head nameseq_list;
|
|
struct list_head subscription_list;
|
|
u32 server_ref;
|
|
struct tipc_event evt;
|
|
};
|
|
|
|
int tipc_subscr_overlap(struct subscription *sub,
|
|
u32 found_lower,
|
|
u32 found_upper);
|
|
|
|
void tipc_subscr_report_overlap(struct subscription *sub,
|
|
u32 found_lower,
|
|
u32 found_upper,
|
|
u32 event,
|
|
u32 port_ref,
|
|
u32 node,
|
|
int must_report);
|
|
|
|
int tipc_subscr_start(void);
|
|
|
|
void tipc_subscr_stop(void);
|
|
|
|
|
|
#endif
|