X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fatm%2Fsvc.c;h=d5314246e0ad28359929fedb910532337cdd656b;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=035068b4764f9b6f4f0a9c4a234d116c2f64bed7;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git diff --git a/net/atm/svc.c b/net/atm/svc.c index 035068b47..d5314246e 100644 --- a/net/atm/svc.c +++ b/net/atm/svc.c @@ -67,13 +67,12 @@ static void svc_disconnect(struct atm_vcc *vcc) /* beware - socket is still in use by atmsigd until the last as_indicate has been answered */ while ((skb = skb_dequeue(&vcc->sk->sk_receive_queue)) != NULL) { + atm_return(vcc, skb->truesize); DPRINTK("LISTEN REL\n"); sigd_enq2(NULL,as_reject,vcc,NULL,NULL,&vcc->qos,0); dev_kfree_skb(skb); } - clear_bit(ATM_VF_REGIS,&vcc->flags); - clear_bit(ATM_VF_RELEASED,&vcc->flags); - clear_bit(ATM_VF_CLOSE,&vcc->flags); + clear_bit(ATM_VF_REGIS, &vcc->flags); /* ... may retry later */ } @@ -90,10 +89,8 @@ static int svc_release(struct socket *sock) /* VCC pointer is used as a reference, so we must not free it (thereby subjecting it to re-use) before all pending connections are closed */ - sock_hold(sk); - vcc_release(sock); svc_disconnect(vcc); - sock_put(sk); + vcc_release(sock); } return 0; } @@ -194,10 +191,6 @@ static int svc_connect(struct socket *sock,struct sockaddr *sockaddr, } break; case SS_UNCONNECTED: - if (test_bit(ATM_VF_SESSION, &vcc->flags)) { - error = -EINVAL; - goto out; - } addr = (struct sockaddr_atmsvc *) sockaddr; if (addr->sas_family != AF_ATMSVC) { error = -EAFNOSUPPORT; @@ -290,7 +283,8 @@ static int svc_connect(struct socket *sock,struct sockaddr *sockaddr, */ if (!(error = vcc_connect(sock, vcc->itf, vcc->vpi, vcc->vci))) sock->state = SS_CONNECTED; - else (void) svc_disconnect(vcc); + else + (void) svc_disconnect(vcc); out: release_sock(sk); return error; @@ -458,24 +452,48 @@ int svc_change_qos(struct atm_vcc *vcc,struct atm_qos *qos) } -static int svc_setsockopt(struct socket *sock,int level,int optname, - char __user *optval,int optlen) +static int svc_setsockopt(struct socket *sock, int level, int optname, + char __user *optval, int optlen) { struct sock *sk = sock->sk; - struct atm_vcc *vcc; - int error = 0; + struct atm_vcc *vcc = ATM_SD(sock); + int value, error = 0; - if (!__SO_LEVEL_MATCH(optname, level) || optname != SO_ATMSAP || - optlen != sizeof(struct atm_sap)) { - error = vcc_setsockopt(sock, level, optname, optval, optlen); - goto out; - } - vcc = ATM_SD(sock); - if (copy_from_user(&vcc->sap, optval, optlen)) { - error = -EFAULT; - goto out; + lock_sock(sk); + switch (optname) { + case SO_ATMSAP: + if (level != SOL_ATM || optlen != sizeof(struct atm_sap)) { + error = -EINVAL; + goto out; + } + if (copy_from_user(&vcc->sap, optval, optlen)) { + error = -EFAULT; + goto out; + } + set_bit(ATM_VF_HASSAP, &vcc->flags); + break; + case SO_MULTIPOINT: + if (level != SOL_ATM || optlen != sizeof(int)) { + error = -EINVAL; + goto out; + } + if (get_user(value, (int __user *) optval)) { + error = -EFAULT; + goto out; + } + if (value == 1) { + set_bit(ATM_VF_SESSION, &vcc->flags); + } else if (value == 0) { + clear_bit(ATM_VF_SESSION, &vcc->flags); + } else { + error = -EINVAL; + } + break; + default: + error = vcc_setsockopt(sock, level, optname, + optval, optlen); } - set_bit(ATM_VF_HASSAP, &vcc->flags); + out: release_sock(sk); return error; @@ -511,6 +529,90 @@ out: } +static int svc_addparty(struct socket *sock, struct sockaddr *sockaddr, + int sockaddr_len, int flags) +{ + DEFINE_WAIT(wait); + struct atm_vcc *vcc = ATM_SD(sock); + int error; + + lock_sock(vcc->sk); + set_bit(ATM_VF_WAITING, &vcc->flags); + prepare_to_wait(vcc->sk->sk_sleep, &wait, TASK_INTERRUPTIBLE); + sigd_enq(vcc, as_addparty, NULL, NULL, + (struct sockaddr_atmsvc *) sockaddr); + if (flags & O_NONBLOCK) { + finish_wait(vcc->sk->sk_sleep, &wait); + error = -EINPROGRESS; + goto out; + } + DPRINTK("svc_addparty added wait queue\n"); + while (test_bit(ATM_VF_WAITING, &vcc->flags) && sigd) { + schedule(); + prepare_to_wait(vcc->sk->sk_sleep, &wait, TASK_INTERRUPTIBLE); + } + finish_wait(vcc->sk->sk_sleep, &wait); + error = xchg(&vcc->sk->sk_err_soft, 0); +out: + release_sock(vcc->sk); + return error; +} + + +static int svc_dropparty(struct socket *sock, int ep_ref) +{ + DEFINE_WAIT(wait); + struct atm_vcc *vcc = ATM_SD(sock); + int error; + + lock_sock(vcc->sk); + set_bit(ATM_VF_WAITING, &vcc->flags); + prepare_to_wait(vcc->sk->sk_sleep, &wait, TASK_INTERRUPTIBLE); + sigd_enq2(vcc, as_dropparty, NULL, NULL, NULL, NULL, ep_ref); + while (test_bit(ATM_VF_WAITING, &vcc->flags) && sigd) { + schedule(); + prepare_to_wait(vcc->sk->sk_sleep, &wait, TASK_INTERRUPTIBLE); + } + finish_wait(vcc->sk->sk_sleep, &wait); + if (!sigd) { + error = -EUNATCH; + goto out; + } + error = xchg(&vcc->sk->sk_err_soft, 0); +out: + release_sock(vcc->sk); + return error; +} + + +static int svc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) +{ + int error, ep_ref; + struct sockaddr_atmsvc sa; + struct atm_vcc *vcc = ATM_SD(sock); + + switch (cmd) { + case ATM_ADDPARTY: + if (!test_bit(ATM_VF_SESSION, &vcc->flags)) + return -EINVAL; + if (copy_from_user(&sa, (void __user *) arg, sizeof(sa))) + return -EFAULT; + error = svc_addparty(sock, (struct sockaddr *) &sa, sizeof(sa), 0); + break; + case ATM_DROPPARTY: + if (!test_bit(ATM_VF_SESSION, &vcc->flags)) + return -EINVAL; + if (copy_from_user(&ep_ref, (void __user *) arg, sizeof(int))) + return -EFAULT; + error = svc_dropparty(sock, ep_ref); + break; + default: + error = vcc_ioctl(sock, cmd, arg); + } + + return error; +} + static struct proto_ops svc_proto_ops = { .family = PF_ATMSVC, .owner = THIS_MODULE, @@ -522,7 +624,7 @@ static struct proto_ops svc_proto_ops = { .accept = svc_accept, .getname = svc_getname, .poll = vcc_poll, - .ioctl = vcc_ioctl, + .ioctl = svc_ioctl, .listen = svc_listen, .shutdown = svc_shutdown, .setsockopt = svc_setsockopt,