[SCTP] Add get_paddrs/get_laddrs support. (ardelle.fan)

include/net/sctp/user.h

@@ -100,6 +100,14 @@ enum sctp_optname {
 #define SCTP_SOCKOPT_BINDX_REM	SCTP_SOCKOPT_BINDX_REM
 	SCTP_SOCKOPT_PEELOFF, 	/* peel off association. */
 #define SCTP_SOCKOPT_PEELOFF	SCTP_SOCKOPT_PEELOFF
+	SCTP_GET_PEER_ADDRS_NUM, 	/* Get number of peer addresss. */
+#define SCTP_GET_PEER_ADDRS_NUM	SCTP_GET_PEER_ADDRS_NUM
+	SCTP_GET_PEER_ADDRS, 	/* Get all peer addresss. */
+#define SCTP_GET_PEER_ADDRS	SCTP_GET_PEER_ADDRS
+	SCTP_GET_LOCAL_ADDRS_NUM, 	/* Get number of local addresss. */
+#define SCTP_GET_LOCAL_ADDRS_NUM	SCTP_GET_LOCAL_ADDRS_NUM
+	SCTP_GET_LOCAL_ADDRS, 	/* Get all local addresss. */
+#define SCTP_GET_LOCAL_ADDRS	SCTP_GET_LOCAL_ADDRS
 };
 
 
@@ -576,6 +584,15 @@ struct sctp_setstrm_timeout   {
 	__u16		ssto_streamid_end;
 };
 
+/*
+ * 8.3 8.5 get all peer/local addresses on a socket
+ * This parameter struct is for getsockopt
+ */
+struct sctp_getaddrs {
+	sctp_assoc_t            assoc_id;
+	int			addr_num;
+	struct sockaddr_storage *addrs;
+};
 
 /* These are bit fields for msghdr->msg_flags.  See section 5.1.  */
 /* On user space Linux, these live in <bits/socket.h> as an enum.  */

net/sctp/socket.c

 /* Copyright (c) 1999-2000 Cisco, Inc.
  * Copyright (c) 1999-2001 Motorola, Inc.
  * Copyright (c) 2001-2003 International Business Machines, Corp.
- * Copyright (c) 2001-2002 Intel Corp.
+ * Copyright (c) 2001-2003 Intel Corp.
  * Copyright (c) 2001-2002 Nokia, Inc.
  * Copyright (c) 2001 La Monte H.P. Yarroll
  *
@@ -47,6 +47,7 @@
  *    Daisy Chang           <daisyc@us.ibm.com>
  *    Sridhar Samudrala     <samudrala@us.ibm.com>
  *    Inaky Perez-Gonzalez  <inaky.gonzalez@intel.com>
+ *    Ardelle Fan	    <ardelle.fan@intel.com>
  *
  * Any bugs reported given to us we will try to fix... any fixes shared will
  * be incorporated into the next SCTP release.
@@ -131,7 +132,7 @@ int sctp_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
 static long sctp_get_port_local(struct sock *, union sctp_addr *);
 
 /* Verify this is a valid sockaddr. */
-static struct sctp_af *sctp_sockaddr_af(struct sctp_opt *opt, 
+static struct sctp_af *sctp_sockaddr_af(struct sctp_opt *opt,
 					union sctp_addr *addr, int len)
 {
 	struct sctp_af *af;
@@ -754,8 +755,8 @@ SCTP_STATIC int sctp_sendmsg(struct kiocb *iocb, struct sock *sk,
 	 */
 	if ((SCTP_SOCKET_UDP_HIGH_BANDWIDTH != sp->type) && msg->msg_name) {
 		int msg_namelen = msg->msg_namelen;
-	
-		err = sctp_verify_addr(sk, (union sctp_addr *)msg->msg_name, 
+
+		err = sctp_verify_addr(sk, (union sctp_addr *)msg->msg_name,
 				       msg_namelen);
 		if (err)
 			return err;
@@ -806,7 +807,7 @@ SCTP_STATIC int sctp_sendmsg(struct kiocb *iocb, struct sock *sk,
 		asoc = sctp_endpoint_lookup_assoc(ep, &to, &transport);
 		if (!asoc) {
 			/* If we could not find a matching association on the
-			 * endpoint, make sure that there is no peeled-off 
+			 * endpoint, make sure that there is no peeled-off
 			 * association on another socket.
 			 */
 			if (sctp_endpoint_is_peeled_off(ep, &to)) {
@@ -1086,8 +1087,8 @@ SCTP_STATIC int sctp_sendmsg(struct kiocb *iocb, struct sock *sk,
  * frag_list. len specifies the total amount of data that needs to be removed.
  * when 'len' bytes could be removed from the skb, it returns 0.
  * If 'len' exceeds the total skb length,  it returns the no. of bytes that
- * could not be removed. 
- */  
+ * could not be removed.
+ */
 static int sctp_skb_pull(struct sk_buff *skb, int len)
 {
 	struct sk_buff *list;
@@ -1159,7 +1160,7 @@ SCTP_STATIC int sctp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr
 
 	/* Get the total length of the skb including any skb's in the
 	 * frag_list.
-	 */ 
+	 */
 	skb_len = skb->len;
 
 	copied = skb_len;
@@ -1195,12 +1196,12 @@ SCTP_STATIC int sctp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr
 	/* If skb's length exceeds the user's buffer, update the skb and
 	 * push it back to the receive_queue so that the next call to
 	 * recvmsg() will return the remaining data. Don't set MSG_EOR.
-	 * Otherwise, set MSG_EOR indicating the end of a message. 
+	 * Otherwise, set MSG_EOR indicating the end of a message.
 	 */
 	if (skb_len > copied) {
 		msg->msg_flags &= ~MSG_EOR;
 		if (flags & MSG_PEEK)
-			goto out_free;	
+			goto out_free;
 		sctp_skb_pull(skb, copied);
 		skb_queue_head(&sk->receive_queue, skb);
 		goto out;
@@ -1468,7 +1469,7 @@ SCTP_STATIC int sctp_connect(struct sock *sk, struct sockaddr *uaddr,
 	sp = sctp_sk(sk);
 	ep = sp->ep;
 
-	/* connect() cannot be done on a peeled-off socket. */ 
+	/* connect() cannot be done on a peeled-off socket. */
 	if (SCTP_SOCKET_UDP_HIGH_BANDWIDTH == sp->type) {
 		err = -EISCONN;
 		goto out_unlock;
@@ -1476,7 +1477,7 @@ SCTP_STATIC int sctp_connect(struct sock *sk, struct sockaddr *uaddr,
 
 	err = sctp_verify_addr(sk, (union sctp_addr *)uaddr, addr_len);
 	if (err)
-		goto out_unlock;	
+		goto out_unlock;
 
 	memcpy(&to, uaddr, addr_len);
 	to.v4.sin_port = ntohs(to.v4.sin_port);
@@ -1484,7 +1485,7 @@ SCTP_STATIC int sctp_connect(struct sock *sk, struct sockaddr *uaddr,
 	asoc = sctp_endpoint_lookup_assoc(ep, &to, &transport);
 	if (asoc) {
 		if (asoc->state >= SCTP_STATE_ESTABLISHED)
-			err = -EISCONN;	
+			err = -EISCONN;
 		else
 			err = -EALREADY;
 		goto out_unlock;
@@ -1522,7 +1523,7 @@ SCTP_STATIC int sctp_connect(struct sock *sk, struct sockaddr *uaddr,
 
 	err = sctp_primitive_ASSOCIATE(asoc, NULL);
 	if (err < 0) {
-		sctp_association_free(asoc); 
+		sctp_association_free(asoc);
 		goto out_unlock;
 	}
 
@@ -1920,7 +1921,7 @@ static inline int sctp_getsockopt_get_peer_addr_params(struct sock *sk,
 	 * before this address shall be considered unreachable.
 	 */
 	params.spp_pathmaxrxt = trans->error_threshold;
-	
+
 	if (copy_to_user(optval, &params, len))
 		return -EFAULT;
 	*optlen = len;
@@ -1937,6 +1938,166 @@ static inline int sctp_getsockopt_initmsg(struct sock *sk, int len, char *optval
 	return 0;
 }
 
+static inline int sctp_getsockopt_get_peer_addrs_num(struct sock *sk, int len,
+				char *optval, int *optlen)
+{
+	sctp_assoc_t id;
+	sctp_association_t *asoc;
+	struct list_head *pos;
+	int cnt = 0;
+
+	if (len != sizeof(sctp_assoc_t))
+		return -EINVAL;
+
+	if (copy_from_user(&id, optval, sizeof(sctp_assoc_t)))
+		return -EFAULT;
+
+	/*
+	 *  For UDP-style sockets, id specifies the association to query.
+	 */
+	asoc = sctp_id2assoc(sk, id);
+	if (!asoc)
+		return -EINVAL;
+
+	list_for_each(pos, &asoc->peer.transport_addr_list) {
+		cnt ++;
+	}
+	if (copy_to_user(optval, &cnt, sizeof(int)))
+		return -EFAULT;
+
+	return 0;
+}
+
+static inline int sctp_getsockopt_get_peer_addrs(struct sock *sk, int len,
+				char *optval, int *optlen)
+{
+	sctp_association_t *asoc;
+	struct list_head *pos;
+	int cnt = 0;
+	struct sctp_getaddrs getaddrs;
+	sctp_transport_t *from;
+	struct sockaddr_storage *to;
+
+	if (len != sizeof(struct sctp_getaddrs))
+		return -EINVAL;
+
+	if (copy_from_user(&getaddrs, optval, sizeof(struct sctp_getaddrs)))
+		return -EFAULT;
+
+	if (getaddrs.addr_num <= 0) return -EINVAL;
+	/*
+	 *  For UDP-style sockets, id specifies the association to query.
+	 */
+	asoc = sctp_id2assoc(sk, getaddrs.assoc_id);
+	if (!asoc)
+		return -EINVAL;
+
+	to = getaddrs.addrs;
+	list_for_each(pos, &asoc->peer.transport_addr_list) {
+		from = list_entry(pos, sctp_transport_t, transports);
+		if (copy_to_user(to, &from->ipaddr, sizeof(from->ipaddr)))
+			return -EFAULT;
+		to ++;
+		cnt ++;
+		if (cnt >= getaddrs.addr_num) break;
+	}
+	getaddrs.addr_num = cnt;
+	if (copy_to_user(optval, &getaddrs, sizeof(struct sctp_getaddrs)))
+		return -EFAULT;
+
+	return 0;
+}
+
+static inline int sctp_getsockopt_get_local_addrs_num(struct sock *sk, int len,
+				char *optval, int *optlen)
+{
+	sctp_assoc_t id;
+	sctp_bind_addr_t *bp;
+	sctp_association_t *asoc;
+	struct list_head *pos;
+	int cnt = 0;
+
+	if (len != sizeof(sctp_assoc_t))
+		return -EINVAL;
+
+	if (copy_from_user(&id, optval, sizeof(sctp_assoc_t)))
+		return -EFAULT;
+
+	/*
+	 *  For UDP-style sockets, id specifies the association to query.
+	 *  If the id field is set to the value '0' then the locally bound
+	 *  addresses are returned without regard to any particular
+	 *  association.
+	 */
+	if (0 == id) {
+		bp = &sctp_sk(sk)->ep->base.bind_addr;
+	} else {
+		asoc = sctp_id2assoc(sk, id);
+		if (!asoc)
+			return -EINVAL;
+		bp = &asoc->base.bind_addr;
+	}
+
+	list_for_each(pos, &bp->address_list) {
+		cnt ++;
+	}
+	if (copy_to_user(optval, &cnt, sizeof(int)))
+		return -EFAULT;
+
+	return 0;
+}
+
+static inline int sctp_getsockopt_get_local_addrs(struct sock *sk, int len,
+				char *optval, int *optlen)
+{
+	sctp_bind_addr_t *bp;
+	sctp_association_t *asoc;
+	struct list_head *pos;
+	int cnt = 0;
+	struct sctp_getaddrs getaddrs;
+	struct sockaddr_storage_list *from;
+	struct sockaddr_storage *to;
+
+	if (len != sizeof(struct sctp_getaddrs))
+		return -EINVAL;
+
+	if (copy_from_user(&getaddrs, optval, sizeof(struct sctp_getaddrs)))
+		return -EFAULT;
+
+	if (getaddrs.addr_num <= 0) return -EINVAL;
+	/*
+	 *  For UDP-style sockets, id specifies the association to query.
+	 *  If the id field is set to the value '0' then the locally bound
+	 *  addresses are returned without regard to any particular
+	 *  association.
+	 */
+	if (0 == getaddrs.assoc_id) {
+		bp = &sctp_sk(sk)->ep->base.bind_addr;
+	} else {
+		asoc = sctp_id2assoc(sk, getaddrs.assoc_id);
+		if (!asoc)
+			return -EINVAL;
+		bp = &asoc->base.bind_addr;
+	}
+
+	to = getaddrs.addrs;
+	list_for_each(pos, &bp->address_list) {
+		from = list_entry(pos,
+				struct sockaddr_storage_list,
+				list);
+		if (copy_to_user(to, &from->a, sizeof(from->a)))
+			return -EFAULT;
+		to ++;
+		cnt ++;
+		if (cnt >= getaddrs.addr_num) break;
+	}
+	getaddrs.addr_num = cnt;
+	if (copy_to_user(optval, &getaddrs, sizeof(struct sctp_getaddrs)))
+		return -EFAULT;
+
+	return 0;
+}
+
 SCTP_STATIC int sctp_getsockopt(struct sock *sk, int level, int optname,
 				char *optval, int *optlen)
 {
@@ -1994,6 +2155,26 @@ SCTP_STATIC int sctp_getsockopt(struct sock *sk, int level, int optname,
 		retval = sctp_getsockopt_initmsg(sk, len, optval, optlen);
 		break;
 
+	case SCTP_GET_PEER_ADDRS_NUM:
+		retval = sctp_getsockopt_get_peer_addrs_num(sk, len, optval,
+							      optlen);
+		break;
+
+	case SCTP_GET_LOCAL_ADDRS_NUM:
+		retval = sctp_getsockopt_get_local_addrs_num(sk, len, optval,
+							      optlen);
+		break;
+
+	case SCTP_GET_PEER_ADDRS:
+		retval = sctp_getsockopt_get_peer_addrs(sk, len, optval,
+							      optlen);
+		break;
+
+	case SCTP_GET_LOCAL_ADDRS:
+		retval = sctp_getsockopt_get_local_addrs(sk, len, optval,
+							      optlen);
+		break;
+
 	default:
 		retval = -ENOPROTOOPT;
 		break;
@@ -2034,7 +2215,7 @@ static long sctp_get_port_local(struct sock *sk, union sctp_addr *addr)
 	sctp_protocol_t *sctp = sctp_get_protocol();
 	unsigned short snum;
 	int ret;
-	
+
 	/* NOTE:  Remember to put this back to net order. */
 	addr->v4.sin_port = ntohs(addr->v4.sin_port);
 	snum = addr->v4.sin_port;
@@ -2103,7 +2284,7 @@ static long sctp_get_port_local(struct sock *sk, union sctp_addr *addr)
 		}
 	}
 
-	
+
 	if (pp != NULL && pp->sk != NULL) {
 		/* We had a port hash table hit - there is an
 		 * available port (pp != NULL) and it is being
@@ -2134,7 +2315,7 @@ static long sctp_get_port_local(struct sock *sk, union sctp_addr *addr)
 
 			if (sk_reuse && sk2->reuse)
 				continue;
-			
+
 			if (sctp_bind_addr_match(&ep2->base.bind_addr, addr,
 						 sctp_sk(sk)))
 				goto found;
@@ -2192,7 +2373,7 @@ static long sctp_get_port_local(struct sock *sk, union sctp_addr *addr)
 }
 
 /* Assign a 'snum' port to the socket.  If snum == 0, an ephemeral
- * port is requested.  
+ * port is requested.
  */
 static int sctp_get_port(struct sock *sk, unsigned short snum)
 {
@@ -2662,10 +2843,10 @@ static int sctp_verify_addr(struct sock *sk, union sctp_addr *addr, int len)
 		return -EINVAL;
 
 	/* Is this a valid SCTP address?  */
-	if (!af->addr_valid((union sctp_addr *)addr)) 
+	if (!af->addr_valid((union sctp_addr *)addr))
 		return -EINVAL;
 
-	return 0;	
+	return 0;
 }
 
 /* Get the sndbuf space available at the time on the association.  */