Skip to contentSkip to conversation

net/dccp: Allow default/fallback service code

PATCH Applied Gerrit Renker 3 participants 4 messages Sep 11, 2006 – Sep 22, 2006

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/dccp: Allow default/fallback service code

[DCCP]: Allow default/fallback service code.

This has been discussed on dccp@vger and removes the necessity for applications to supply service codes in each and every case.

If an application does not want to provide a service code, that's fine, it will be given 0. Otherwise, service codes can be set via socket options as before.

This patch has been tested using various client/server configurations (including listening on multiple service codes) and patches against Torvalds' tree.

--

 Documentation/networking/dccp.txt |    7 +++++--
 include/linux/dccp.h              |    6 +-----
 net/dccp/ipv4.c                   |    3 ---
 net/dccp/proto.c                  |   11 +----------
 4 files changed, 7 insertions(+), 20 deletions(-)
Documentation/networking/dccp.txt +5 -2
index c45daab..2f479af 100644
@@ -42,8 +42,11 @@ Socket options
 DCCP_SOCKOPT_PACKET_SIZE is used for CCID3 to set default packet size for
 calculations.
 
-DCCP_SOCKOPT_SERVICE sets the service. This is compulsory as per the
-specification. If you don't set it you will get EPROTO.
+DCCP_SOCKOPT_SERVICE sets the service. The specification mandates use of
+service codes (RFC 4340, sec. 8.1.2); if this socket option is not set,
+the socket will fall back to 0 (which means that no meaningful service code
+is present). Connecting sockets set at most one service option; for
+listening sockets, multiple service codes can be specified.
 
 Notes
 ==diff --git a/include/linux/dccp.h b/include/linux/dccp.h

index 676333b..30ce4b3 100644

include/linux/dccp.h +1 -5
@@ -404,6 +404,7 @@ struct dccp_service_list {
 };
 
 #define DCCP_SERVICE_INVALID_VALUE htonl((__u32)-1)
+#define DCCP_SERVICE_CODE_IS_ABSENT              0
 
 static inline int dccp_list_has_service(const struct dccp_service_list *sl,
                                        const __be32 service)
@@ -482,11 +483,6 @@ static inline struct dccp_minisock *dccp
        return (struct dccp_minisock *)&dccp_sk(sk)->dccps_minisock;
 }
 
-static inline int dccp_service_not_initialized(const struct sock *sk)
-{
-       return dccp_sk(sk)->dccps_service = DCCP_SERVICE_INVALID_VALUE;
-}
-
 static inline const char *dccp_role(const struct sock *sk)
 {
        switch (dccp_sk(sk)->dccps_role) {
net/dccp/ipv4.c +0 -3
index 7f56f7e..ef60f4e 100644
@@ -56,9 +56,6 @@ int dccp_v4_connect(struct sock *sk, str
 
        dp->dccps_role = DCCP_ROLE_CLIENT;
 
-       if (dccp_service_not_initialized(sk))
-               return -EPROTO;
-
        if (addr_len < sizeof(struct sockaddr_in))
                return -EINVAL;
 
net/dccp/proto.c +1 -10
index 6f14bb5..f1b88c8 100644
@@ -217,7 +217,7 @@ int dccp_init_sock(struct sock *sk, cons
        icsk->icsk_sync_mss     = dccp_sync_mss;
        dp->dccps_mss_cache     = 536;
        dp->dccps_role          = DCCP_ROLE_UNDEFINED;
-       dp->dccps_service       = DCCP_SERVICE_INVALID_VALUE;
+       dp->dccps_service       = DCCP_SERVICE_CODE_IS_ABSENT;
        dp->dccps_l_ack_ratio   = dp->dccps_r_ack_ratio = 1;
 
        return 0;
@@ -267,12 +267,6 @@ static inline int dccp_listen_start(stru
        struct dccp_sock *dp = dccp_sk(sk);
 
        dp->dccps_role = DCCP_ROLE_LISTEN;
-       /*
-        * Apps need to use setsockopt(DCCP_SOCKOPT_SERVICE)
-        * before calling listen()
-        */
-       if (dccp_service_not_initialized(sk))
-               return -EPROTO;
        return inet_csk_listen_start(sk, TCP_SYNQ_HSIZE);
 }
 
@@ -540,9 +534,6 @@ static int dccp_getsockopt_service(struc
        int err = -ENOENT, slen = 0, total_len = sizeof(u32);
 
        lock_sock(sk);
-       if (dccp_service_not_initialized(sk))
-               goto out;
-
        if ((sl = dp->dccps_service_list) != NULL) {
                slen = sl->dccpsl_nr * sizeof(u32);
                total_len += slen;
#1 lore raw

Gerrit,

Not sure what happened here but I can't apply this with git-apply. Can you check and resubmit. Looks great patch though and would love to test! This would mean DCCP is easier to port to which must be good.

Just a quick note - you didn't updated last changed date in Documentation/networking/dccp.txt. I think rather than updating you can remove as people can find dates by looking at git history.

Ian

Quoted 31 lines · Gerrit Renker

[DCCP]: Allow default/fallback service code.

This has been discussed on dccp@vger and removes the necessity for applications to supply service codes in each and every case.

If an application does not want to provide a service code, that's fine, it will be given 0. Otherwise, service codes can be set via socket options as before.

This patch has been tested using various client/server configurations (including listening on multiple service codes) and patches against Torvalds' tree.

--

 Documentation/networking/dccp.txt |    7 +++++--
 include/linux/dccp.h              |    6 +-----
 net/dccp/ipv4.c                   |    3 ---
 net/dccp/proto.c                  |   11 +----------
 4 files changed, 7 insertions(+), 20 deletions(-)
Documentation/networking/dccp.txt +0 -1
index c45daab..2f479af 100644
@@ -42,8 +42,11 @@ Socket options
 DCCP_SOCKOPT_PACKET_SIZE is used for CCID3 to set default packet size for
 calculations.
 
-DCCP_SOCKOPT_SERVICE sets the service. This is compulsory as per the
Signature · 7 lines
Ian McDonald
Web: http://wand.net.nz/~iam4
Blog: http://imcdnzl.blogspot.com
WAND Network Research Group
Department of Computer Science
University of Waikato
New Zealand
#2 lore raw

[DCCP]: If an application does not want to provide a service code, that's
fine, it will be given 0. Otherwise, service codes can be set via socket options as before.

This has fixes as below.

|  Not sure what happened here but I can't apply this with git-apply. Can
|  you check and resubmit. Looks great patch though and would love to
|  test! This would mean DCCP is easier to port to which must be good.

You are right; sorry - I normally do patches for every possible kernel version and I accidentally submitted the one for the stable kernel. This one patches correctly against David's 2.6.19 tree and is the same, tested and verified code.

|  Just a quick note - you didn't updated last changed date in
|  Documentation/networking/dccp.txt. I think rather than updating you
|  can remove as people can find dates by looking at git history.

I have done this also. Thank you for checking.

--

 Documentation/networking/dccp.txt |    8 +++++---
 include/linux/dccp.h              |    6 +-----
 net/dccp/ipv4.c                   |    3 ---
 net/dccp/proto.c                  |   11 +----------
 4 files changed, 7 insertions(+), 21 deletions(-)
Documentation/networking/dccp.txt +5 -3
index c45daab..74563b3 100644
@@ -1,7 +1,6 @@
 DCCP protocol
 ======
 
-Last updated: 10 November 2005
 
 Contents
 ====
@@ -42,8 +41,11 @@ Socket options
 DCCP_SOCKOPT_PACKET_SIZE is used for CCID3 to set default packet size for
 calculations.
 
-DCCP_SOCKOPT_SERVICE sets the service. This is compulsory as per the
-specification. If you don't set it you will get EPROTO.
+DCCP_SOCKOPT_SERVICE sets the service. The specification mandates use of
+service codes (RFC 4340, sec. 8.1.2); if this socket option is not set,
+the socket will fall back to 0 (which means that no meaningful service code
+is present). Connecting sockets set at most one service option; for
+listening sockets, multiple service codes can be specified.
 
 Notes
 ==diff --git a/include/linux/dccp.h b/include/linux/dccp.h

index 2d7671c..29f9291 100644

include/linux/dccp.h +1 -5
@@ -404,6 +404,7 @@ struct dccp_service_list {
 };
 
 #define DCCP_SERVICE_INVALID_VALUE htonl((__u32)-1)
+#define DCCP_SERVICE_CODE_IS_ABSENT 		 0
 
 static inline int dccp_list_has_service(const struct dccp_service_list *sl,
 					const __be32 service)
@@ -484,11 +485,6 @@ static inline struct dccp_minisock *dccp
 	return (struct dccp_minisock *)&dccp_sk(sk)->dccps_minisock;
 }
 
-static inline int dccp_service_not_initialized(const struct sock *sk)
-{
-	return dccp_sk(sk)->dccps_service = DCCP_SERVICE_INVALID_VALUE;
-}
-
 static inline const char *dccp_role(const struct sock *sk)
 {
 	switch (dccp_sk(sk)->dccps_role) {
net/dccp/ipv4.c +0 -3
index 9a1a76a..66be29b 100644
@@ -56,9 +56,6 @@ int dccp_v4_connect(struct sock *sk, str
 
 	dp->dccps_role = DCCP_ROLE_CLIENT;
 
-	if (dccp_service_not_initialized(sk))
-		return -EPROTO;
-
 	if (addr_len < sizeof(struct sockaddr_in))
 		return -EINVAL;
 
net/dccp/proto.c +1 -10
index 962df0e..72cbdcf 100644
@@ -217,7 +217,7 @@ int dccp_init_sock(struct sock *sk, cons
 	icsk->icsk_sync_mss	= dccp_sync_mss;
 	dp->dccps_mss_cache	= 536;
 	dp->dccps_role		= DCCP_ROLE_UNDEFINED;
-	dp->dccps_service	= DCCP_SERVICE_INVALID_VALUE;
+	dp->dccps_service	= DCCP_SERVICE_CODE_IS_ABSENT;
 	dp->dccps_l_ack_ratio	= dp->dccps_r_ack_ratio = 1;
 
 	return 0;
@@ -267,12 +267,6 @@ static inline int dccp_listen_start(stru
 	struct dccp_sock *dp = dccp_sk(sk);
 
 	dp->dccps_role = DCCP_ROLE_LISTEN;
-	/*
-	 * Apps need to use setsockopt(DCCP_SOCKOPT_SERVICE)
-	 * before calling listen()
-	 */
-	if (dccp_service_not_initialized(sk))
-		return -EPROTO;
 	return inet_csk_listen_start(sk, TCP_SYNQ_HSIZE);
 }
 
@@ -540,9 +534,6 @@ static int dccp_getsockopt_service(struc
 	int err = -ENOENT, slen = 0, total_len = sizeof(u32);
 
 	lock_sock(sk);
-	if (dccp_service_not_initialized(sk))
-		goto out;
-
 	if ((sl = dp->dccps_service_list) != NULL) {
 		slen = sl->dccpsl_nr * sizeof(u32);
 		total_len += slen;