Commit c4907c6e authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sctp-cleanups' 



Marcelo Ricardo Leitner says:

====================
SCTP cleanups

Some cleanups/simplifications I've been collecting.
Resending now with net-next open.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8f18e4d0 509e7a31

include/net/sctp/structs.h

+3 −4
Original line number Diff line number Diff line
@@ -722,10 +722,9 @@ struct sctp_packet { 
	    ipfragok:1;		/* So let ip fragment this packet */

};



struct sctp_packet *sctp_packet_init(struct sctp_packet *,

				     struct sctp_transport *,

void sctp_packet_init(struct sctp_packet *, struct sctp_transport *,

		      __u16 sport, __u16 dport);

struct sctp_packet *sctp_packet_config(struct sctp_packet *, __u32 vtag, int);

void sctp_packet_config(struct sctp_packet *, __u32 vtag, int);

sctp_xmit_t sctp_packet_transmit_chunk(struct sctp_packet *,

				       struct sctp_chunk *, int, gfp_t);

sctp_xmit_t sctp_packet_append_chunk(struct sctp_packet *,

net/sctp/ipv6.c

+7 −9
Original line number Diff line number Diff line
@@ -412,22 +412,20 @@ static void sctp_v6_copy_addrlist(struct list_head *addrlist, 
static void sctp_v6_from_skb(union sctp_addr *addr, struct sk_buff *skb,

			     int is_saddr)

{

	__be16 *port;

	struct sctphdr *sh;

	/* Always called on head skb, so this is safe */

	struct sctphdr *sh = sctp_hdr(skb);

	struct sockaddr_in6 *sa = &addr->v6;



	port = &addr->v6.sin6_port;

	addr->v6.sin6_family = AF_INET6;

	addr->v6.sin6_flowinfo = 0; /* FIXME */

	addr->v6.sin6_scope_id = ((struct inet6_skb_parm *)skb->cb)->iif;



	/* Always called on head skb, so this is safe */

	sh = sctp_hdr(skb);

	if (is_saddr) {

		*port  = sh->source;

		addr->v6.sin6_addr = ipv6_hdr(skb)->saddr;

		sa->sin6_port = sh->source;

		sa->sin6_addr = ipv6_hdr(skb)->saddr;

	} else {

		*port = sh->dest;

		addr->v6.sin6_addr = ipv6_hdr(skb)->daddr;

		sa->sin6_port = sh->dest;

		sa->sin6_addr = ipv6_hdr(skb)->daddr;

	}

}

net/sctp/output.c

+5 −9
Original line number Diff line number Diff line
@@ -81,8 +81,8 @@ static void sctp_packet_reset(struct sctp_packet *packet) 
/* Config a packet.

 * This appears to be a followup set of initializations.

 */

struct sctp_packet *sctp_packet_config(struct sctp_packet *packet,

				       __u32 vtag, int ecn_capable)

void sctp_packet_config(struct sctp_packet *packet, __u32 vtag,

			int ecn_capable)

{

	struct sctp_transport *tp = packet->transport;

	struct sctp_association *asoc = tp->asoc;
@@ -123,12 +123,10 @@ struct sctp_packet *sctp_packet_config(struct sctp_packet *packet, 
		if (chunk)

			sctp_packet_append_chunk(packet, chunk);

	}



	return packet;

}



/* Initialize the packet structure. */

struct sctp_packet *sctp_packet_init(struct sctp_packet *packet,

void sctp_packet_init(struct sctp_packet *packet,

		      struct sctp_transport *transport,

		      __u16 sport, __u16 dport)

{
@@ -151,8 +149,6 @@ struct sctp_packet *sctp_packet_init(struct sctp_packet *packet, 
	packet->overhead = overhead;

	sctp_packet_reset(packet);

	packet->vtag = 0;



	return packet;

}



/* Free a packet.  */

net/sctp/protocol.c

+7 −11
Original line number Diff line number Diff line
@@ -237,23 +237,19 @@ int sctp_copy_local_addr_list(struct net *net, struct sctp_bind_addr *bp, 
static void sctp_v4_from_skb(union sctp_addr *addr, struct sk_buff *skb,

			     int is_saddr)

{

	void *from;

	__be16 *port;

	struct sctphdr *sh;

	/* Always called on head skb, so this is safe */

	struct sctphdr *sh = sctp_hdr(skb);

	struct sockaddr_in *sa = &addr->v4;



	port = &addr->v4.sin_port;

	addr->v4.sin_family = AF_INET;



	/* Always called on head skb, so this is safe */

	sh = sctp_hdr(skb);

	if (is_saddr) {

		*port  = sh->source;

		from = &ip_hdr(skb)->saddr;

		sa->sin_port = sh->source;

		sa->sin_addr.s_addr = ip_hdr(skb)->saddr;

	} else {

		*port = sh->dest;

		from = &ip_hdr(skb)->daddr;

		sa->sin_port = sh->dest;

		sa->sin_addr.s_addr = ip_hdr(skb)->daddr;

	}

	memcpy(&addr->v4.sin_addr.s_addr, from, sizeof(struct in_addr));

}



/* Initialize an sctp_addr from a socket. */

net/sctp/sm_statefuns.c

+59 −63
Original line number Diff line number Diff line
@@ -160,23 +160,22 @@ static sctp_disposition_t __sctp_sf_do_9_1_abort(struct net *net, 
/* Small helper function that checks if the chunk length

 * is of the appropriate length.  The 'required_length' argument

 * is set to be the size of a specific chunk we are testing.

 * Return Values:  1 = Valid length

 * 		   0 = Invalid length

 * Return Values:  true  = Valid length

 * 		   false = Invalid length

 *

 */

static inline int

sctp_chunk_length_valid(struct sctp_chunk *chunk,

			   __u16 required_length)

static inline bool

sctp_chunk_length_valid(struct sctp_chunk *chunk, __u16 required_length)

{

	__u16 chunk_length = ntohs(chunk->chunk_hdr->length);



	/* Previously already marked? */

	if (unlikely(chunk->pdiscard))

		return 0;

		return false;

	if (unlikely(chunk_length < required_length))

		return 0;

		return false;



	return 1;

	return true;

}



/**********************************************************
@@ -3237,8 +3236,9 @@ static sctp_disposition_t sctp_sf_tabort_8_4_8(struct net *net, 
	struct sctp_chunk *abort;



	packet = sctp_ootb_pkt_new(net, asoc, chunk);

	if (!packet)

		return SCTP_DISPOSITION_NOMEM;



	if (packet) {

	/* Make an ABORT. The T bit will be set if the asoc

	 * is NULL.

	 */
@@ -3266,9 +3266,6 @@ static sctp_disposition_t sctp_sf_tabort_8_4_8(struct net *net, 
	return SCTP_DISPOSITION_CONSUME;

}



	return SCTP_DISPOSITION_NOMEM;

}



/*

 * Received an ERROR chunk from peer.  Generate SCTP_REMOTE_ERROR

 * event as ULP notification for each cause included in the chunk.
@@ -3503,8 +3500,9 @@ static sctp_disposition_t sctp_sf_shut_8_4_5(struct net *net, 
	struct sctp_chunk *shut;



	packet = sctp_ootb_pkt_new(net, asoc, chunk);

	if (!packet)

		return SCTP_DISPOSITION_NOMEM;



	if (packet) {

	/* Make an SHUTDOWN_COMPLETE.

	 * The T bit will be set if the asoc is NULL.

	 */
@@ -3541,9 +3539,6 @@ static sctp_disposition_t sctp_sf_shut_8_4_5(struct net *net, 
	return sctp_sf_pdiscard(net, ep, asoc, type, arg, commands);

}



	return SCTP_DISPOSITION_NOMEM;

}



/*

 * Handle SHUTDOWN ACK in COOKIE_ECHOED or COOKIE_WAIT state.

 *
@@ -6036,8 +6031,9 @@ static struct sctp_packet *sctp_ootb_pkt_new(struct net *net, 
	sctp_transport_route(transport, (union sctp_addr *)&chunk->dest,

			     sctp_sk(net->sctp.ctl_sock));



	packet = sctp_packet_init(&transport->packet, transport, sport, dport);

	packet = sctp_packet_config(packet, vtag, 0);

	packet = &transport->packet;

	sctp_packet_init(packet, transport, sport, dport);

	sctp_packet_config(packet, vtag, 0);



	return packet;