aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/ipv6.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@mandriva.com>2005-12-14 02:26:10 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-01-03 16:10:58 -0500
commitd83d8461f902c672bc1bd8fbc6a94e19f092da97 (patch)
tree0534c553ab92baa2eb9dbb5bba64f2c4540b1e89 /net/dccp/ipv6.c
parent22712813620fa8e682dbfb253a60ca0131da1e07 (diff)
[IP_SOCKGLUE]: Remove most of the tcp specific calls
As DCCP needs to be called in the same spots. Now we have a member in inet_sock (is_icsk), set at sock creation time from struct inet_protosw->flags (if INET_PROTOSW_ICSK is set, like for TCP and DCCP) to see if a struct sock instance is a inet_connection_sock for places like the ones in ip_sockglue.c (v4 and v6) where we previously were looking if sk_type was SOCK_STREAM, that is insufficient because we now use the same code for DCCP, that has sk_type SOCK_DCCP. Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/ipv6.c')
-rw-r--r--net/dccp/ipv6.c26
1 files changed, 14 insertions, 12 deletions
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index 71bf04eb21e1..599b0be21515 100644
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -88,6 +88,7 @@ static int dccp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
88 int addr_len) 88 int addr_len)
89{ 89{
90 struct sockaddr_in6 *usin = (struct sockaddr_in6 *) uaddr; 90 struct sockaddr_in6 *usin = (struct sockaddr_in6 *) uaddr;
91 struct inet_connection_sock *icsk = inet_csk(sk);
91 struct inet_sock *inet = inet_sk(sk); 92 struct inet_sock *inet = inet_sk(sk);
92 struct ipv6_pinfo *np = inet6_sk(sk); 93 struct ipv6_pinfo *np = inet6_sk(sk);
93 struct dccp_sock *dp = dccp_sk(sk); 94 struct dccp_sock *dp = dccp_sk(sk);
@@ -158,7 +159,7 @@ static int dccp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
158 */ 159 */
159 160
160 if (addr_type == IPV6_ADDR_MAPPED) { 161 if (addr_type == IPV6_ADDR_MAPPED) {
161 u32 exthdrlen = dp->dccps_ext_header_len; 162 u32 exthdrlen = icsk->icsk_ext_hdr_len;
162 struct sockaddr_in sin; 163 struct sockaddr_in sin;
163 164
164 SOCK_DEBUG(sk, "connect: ipv4 mapped\n"); 165 SOCK_DEBUG(sk, "connect: ipv4 mapped\n");
@@ -170,14 +171,14 @@ static int dccp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
170 sin.sin_port = usin->sin6_port; 171 sin.sin_port = usin->sin6_port;
171 sin.sin_addr.s_addr = usin->sin6_addr.s6_addr32[3]; 172 sin.sin_addr.s_addr = usin->sin6_addr.s6_addr32[3];
172 173
173 inet_csk(sk)->icsk_af_ops = &dccp_ipv6_mapped; 174 icsk->icsk_af_ops = &dccp_ipv6_mapped;
174 sk->sk_backlog_rcv = dccp_v4_do_rcv; 175 sk->sk_backlog_rcv = dccp_v4_do_rcv;
175 176
176 err = dccp_v4_connect(sk, (struct sockaddr *)&sin, sizeof(sin)); 177 err = dccp_v4_connect(sk, (struct sockaddr *)&sin, sizeof(sin));
177 178
178 if (err) { 179 if (err) {
179 dp->dccps_ext_header_len = exthdrlen; 180 icsk->icsk_ext_hdr_len = exthdrlen;
180 inet_csk(sk)->icsk_af_ops = &dccp_ipv6_af_ops; 181 icsk->icsk_af_ops = &dccp_ipv6_af_ops;
181 sk->sk_backlog_rcv = dccp_v6_do_rcv; 182 sk->sk_backlog_rcv = dccp_v6_do_rcv;
182 goto failure; 183 goto failure;
183 } else { 184 } else {
@@ -227,9 +228,10 @@ static int dccp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
227 228
228 ip6_dst_store(sk, dst, NULL); 229 ip6_dst_store(sk, dst, NULL);
229 230
230 dp->dccps_ext_header_len = 0; 231 icsk->icsk_ext_hdr_len = 0;
231 if (np->opt) 232 if (np->opt)
232 dp->dccps_ext_header_len = np->opt->opt_flen + np->opt->opt_nflen; 233 icsk->icsk_ext_hdr_len = (np->opt->opt_flen +
234 np->opt->opt_nflen);
233 235
234 inet->dport = usin->sin6_port; 236 inet->dport = usin->sin6_port;
235 237
@@ -292,7 +294,6 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
292 np = inet6_sk(sk); 294 np = inet6_sk(sk);
293 295
294 if (type == ICMPV6_PKT_TOOBIG) { 296 if (type == ICMPV6_PKT_TOOBIG) {
295 struct dccp_sock *dp = dccp_sk(sk);
296 struct dst_entry *dst = NULL; 297 struct dst_entry *dst = NULL;
297 298
298 if (sock_owned_by_user(sk)) 299 if (sock_owned_by_user(sk))
@@ -332,7 +333,7 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
332 } else 333 } else
333 dst_hold(dst); 334 dst_hold(dst);
334 335
335 if (dp->dccps_pmtu_cookie > dst_mtu(dst)) { 336 if (inet_csk(sk)->icsk_pmtu_cookie > dst_mtu(dst)) {
336 dccp_sync_mss(sk, dst_mtu(dst)); 337 dccp_sync_mss(sk, dst_mtu(dst));
337 } /* else let the usual retransmit timer handle it */ 338 } /* else let the usual retransmit timer handle it */
338 dst_release(dst); 339 dst_release(dst);
@@ -808,7 +809,7 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk,
808 worked with IPv6 icsk.icsk_af_ops. 809 worked with IPv6 icsk.icsk_af_ops.
809 Sync it now. 810 Sync it now.
810 */ 811 */
811 dccp_sync_mss(newsk, newdp->dccps_pmtu_cookie); 812 dccp_sync_mss(newsk, inet_csk(newsk)->icsk_pmtu_cookie);
812 813
813 return newsk; 814 return newsk;
814 } 815 }
@@ -916,10 +917,10 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk,
916 sock_kfree_s(sk, opt, opt->tot_len); 917 sock_kfree_s(sk, opt, opt->tot_len);
917 } 918 }
918 919
919 newdp->dccps_ext_header_len = 0; 920 inet_csk(newsk)->icsk_ext_hdr_len = 0;
920 if (newnp->opt) 921 if (newnp->opt)
921 newdp->dccps_ext_header_len = newnp->opt->opt_nflen + 922 inet_csk(newsk)->icsk_ext_hdr_len = (newnp->opt->opt_nflen +
922 newnp->opt->opt_flen; 923 newnp->opt->opt_flen);
923 924
924 dccp_sync_mss(newsk, dst_mtu(dst)); 925 dccp_sync_mss(newsk, dst_mtu(dst));
925 926
@@ -1230,6 +1231,7 @@ static struct inet_protosw dccp_v6_protosw = {
1230 .prot = &dccp_v6_prot, 1231 .prot = &dccp_v6_prot,
1231 .ops = &inet6_dccp_ops, 1232 .ops = &inet6_dccp_ops,
1232 .capability = -1, 1233 .capability = -1,
1234 .flags = INET_PROTOSW_ICSK,
1233}; 1235};
1234 1236
1235static int __init dccp_v6_init(void) 1237static int __init dccp_v6_init(void)