aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@mandriva.com>2005-08-28 03:51:32 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2005-08-29 19:13:37 -0400
commita84ffe430342db6ee585a5038f3242a6b4112d69 (patch)
treedb6eeaf68290a0247449e824e3c46a7929f4be02 /net
parent0ac4f893f20ed524198da5ebf591fc0b9e2ced2f (diff)
[DCCP]: Introduce DCCP_SOCKOPT_PACKET_SIZE
So that applications can set dccp_sock->dccps_pkt_size, that in turn is used in the CCID3 half connection init routines to set ccid3hc[tr]x_s and use it in its rate calculations. Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/dccp/ccids/ccid3.c12
-rw-r--r--net/dccp/proto.c52
2 files changed, 54 insertions, 10 deletions
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
index 4ff6ede0f07d..e22b0eefdbf9 100644
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -672,9 +672,9 @@ static int ccid3_hc_tx_init(struct sock *sk)
672 672
673 memset(hctx, 0, sizeof(*hctx)); 673 memset(hctx, 0, sizeof(*hctx));
674 674
675 if (dp->dccps_avg_packet_size >= TFRC_MIN_PACKET_SIZE && 675 if (dp->dccps_packet_size >= TFRC_MIN_PACKET_SIZE &&
676 dp->dccps_avg_packet_size <= TFRC_MAX_PACKET_SIZE) 676 dp->dccps_packet_size <= TFRC_MAX_PACKET_SIZE)
677 hctx->ccid3hctx_s = (u16)dp->dccps_avg_packet_size; 677 hctx->ccid3hctx_s = dp->dccps_packet_size;
678 else 678 else
679 hctx->ccid3hctx_s = TFRC_STD_PACKET_SIZE; 679 hctx->ccid3hctx_s = TFRC_STD_PACKET_SIZE;
680 680
@@ -1058,9 +1058,9 @@ static int ccid3_hc_rx_init(struct sock *sk)
1058 1058
1059 memset(hcrx, 0, sizeof(*hcrx)); 1059 memset(hcrx, 0, sizeof(*hcrx));
1060 1060
1061 if (dp->dccps_avg_packet_size >= TFRC_MIN_PACKET_SIZE && 1061 if (dp->dccps_packet_size >= TFRC_MIN_PACKET_SIZE &&
1062 dp->dccps_avg_packet_size <= TFRC_MAX_PACKET_SIZE) 1062 dp->dccps_packet_size <= TFRC_MAX_PACKET_SIZE)
1063 hcrx->ccid3hcrx_s = (u16)dp->dccps_avg_packet_size; 1063 hcrx->ccid3hcrx_s = dp->dccps_packet_size;
1064 else 1064 else
1065 hcrx->ccid3hcrx_s = TFRC_STD_PACKET_SIZE; 1065 hcrx->ccid3hcrx_s = TFRC_STD_PACKET_SIZE;
1066 1066
diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index f4da6561e40c..18a0e69c9dc7 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -205,23 +205,67 @@ int dccp_ioctl(struct sock *sk, int cmd, unsigned long arg)
205int dccp_setsockopt(struct sock *sk, int level, int optname, 205int dccp_setsockopt(struct sock *sk, int level, int optname,
206 char __user *optval, int optlen) 206 char __user *optval, int optlen)
207{ 207{
208 dccp_pr_debug("entry\n"); 208 struct dccp_sock *dp;
209 int err;
210 int val;
209 211
210 if (level != SOL_DCCP) 212 if (level != SOL_DCCP)
211 return ip_setsockopt(sk, level, optname, optval, optlen); 213 return ip_setsockopt(sk, level, optname, optval, optlen);
212 214
213 return -EOPNOTSUPP; 215 if (optlen < sizeof(int))
216 return -EINVAL;
217
218 if (get_user(val, (int __user *)optval))
219 return -EFAULT;
220
221 lock_sock(sk);
222
223 dp = dccp_sk(sk);
224 err = 0;
225
226 switch (optname) {
227 case DCCP_SOCKOPT_PACKET_SIZE:
228 dp->dccps_packet_size = val;
229 break;
230 default:
231 err = -ENOPROTOOPT;
232 break;
233 }
234
235 release_sock(sk);
236 return err;
214} 237}
215 238
216int dccp_getsockopt(struct sock *sk, int level, int optname, 239int dccp_getsockopt(struct sock *sk, int level, int optname,
217 char __user *optval, int __user *optlen) 240 char __user *optval, int __user *optlen)
218{ 241{
219 dccp_pr_debug("entry\n"); 242 struct dccp_sock *dp;
243 int val, len;
220 244
221 if (level != SOL_DCCP) 245 if (level != SOL_DCCP)
222 return ip_getsockopt(sk, level, optname, optval, optlen); 246 return ip_getsockopt(sk, level, optname, optval, optlen);
223 247
224 return -EOPNOTSUPP; 248 if (get_user(len, optlen))
249 return -EFAULT;
250
251 len = min_t(unsigned int, len, sizeof(int));
252 if (len < 0)
253 return -EINVAL;
254
255 dp = dccp_sk(sk);
256
257 switch (optname) {
258 case DCCP_SOCKOPT_PACKET_SIZE:
259 val = dp->dccps_packet_size;
260 break;
261 default:
262 return -ENOPROTOOPT;
263 }
264
265 if (put_user(len, optlen) || copy_to_user(optval, &val, len))
266 return -EFAULT;
267
268 return 0;
225} 269}
226 270
227int dccp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, 271int dccp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,