Blame view
net/x25/af_x25.c
40.4 KB
1da177e4c Linux-2.6.12-rc2 |
1 2 3 4 5 |
/* * X.25 Packet Layer release 002 * * This is ALPHA test software. This code may break your machine, * randomly fail to work with new releases, misbehave and/or generally |
f8e1d2018 [NET] X25: Fix wh... |
6 |
* screw up. It might even work. |
1da177e4c Linux-2.6.12-rc2 |
7 8 9 10 11 12 13 14 15 16 17 18 19 20 |
* * This code REQUIRES 2.1.15 or higher * * This module: * This module is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * * History * X.25 001 Jonathan Naylor Started coding. * X.25 002 Jonathan Naylor Centralised disconnect handling. * New timer architecture. * 2000-03-11 Henner Eisen MSG_EOR handling more POSIX compliant. |
f8e1d2018 [NET] X25: Fix wh... |
21 22 |
* 2000-03-22 Daniela Squassoni Allowed disabling/enabling of * facilities negotiation and increased |
1da177e4c Linux-2.6.12-rc2 |
23 24 |
* the throughput upper limit. * 2000-08-27 Arnaldo C. Melo s/suser/capable/ + micro cleanups |
f8e1d2018 [NET] X25: Fix wh... |
25 |
* 2000-09-04 Henner Eisen Set sock->state in x25_accept(). |
1da177e4c Linux-2.6.12-rc2 |
26 27 28 29 30 31 |
* Fixed x25_output() related skb leakage. * 2000-10-02 Henner Eisen Made x25_kick() single threaded per socket. * 2000-10-27 Henner Eisen MSG_DONTWAIT for fragment allocation. * 2000-11-14 Henner Eisen Closing datalink from NETDEV_GOING_DOWN * 2002-10-06 Arnaldo C. Melo Get rid of cli/sti, move proc stuff to * x25_proc.c, using seq_file |
cb65d506c [X25]: Selective ... |
32 33 |
* 2005-04-02 Shaun Pereira Selective sub address matching * with call user data |
ebc3f64b8 [X25]: Fast selec... |
34 35 |
* 2005-04-15 Shaun Pereira Fast select with no restriction on * response |
1da177e4c Linux-2.6.12-rc2 |
36 |
*/ |
1da177e4c Linux-2.6.12-rc2 |
37 |
#include <linux/module.h> |
4fc268d24 [PATCH] capable/c... |
38 |
#include <linux/capability.h> |
1da177e4c Linux-2.6.12-rc2 |
39 40 41 42 43 44 45 46 47 |
#include <linux/errno.h> #include <linux/kernel.h> #include <linux/sched.h> #include <linux/timer.h> #include <linux/string.h> #include <linux/net.h> #include <linux/netdevice.h> #include <linux/if_arp.h> #include <linux/skbuff.h> |
5a0e3ad6a include cleanup: ... |
48 |
#include <linux/slab.h> |
1da177e4c Linux-2.6.12-rc2 |
49 |
#include <net/sock.h> |
c752f0739 [TCP]: Move the t... |
50 |
#include <net/tcp_states.h> |
1da177e4c Linux-2.6.12-rc2 |
51 52 53 54 55 |
#include <asm/uaccess.h> #include <linux/fcntl.h> #include <linux/termios.h> /* For TIOCINQ/OUTQ */ #include <linux/notifier.h> #include <linux/init.h> |
1b06e6ba2 [X25]: ioctl conv... |
56 |
#include <linux/compat.h> |
a9288525d X25: Dont let x25... |
57 |
#include <linux/ctype.h> |
1b06e6ba2 [X25]: ioctl conv... |
58 |
|
1da177e4c Linux-2.6.12-rc2 |
59 |
#include <net/x25.h> |
1b06e6ba2 [X25]: ioctl conv... |
60 |
#include <net/compat.h> |
1da177e4c Linux-2.6.12-rc2 |
61 62 63 64 65 66 |
int sysctl_x25_restart_request_timeout = X25_DEFAULT_T20; int sysctl_x25_call_request_timeout = X25_DEFAULT_T21; int sysctl_x25_reset_request_timeout = X25_DEFAULT_T22; int sysctl_x25_clear_request_timeout = X25_DEFAULT_T23; int sysctl_x25_ack_holdback_timeout = X25_DEFAULT_T2; |
39e21c0d3 [X.25]: Adds /pro... |
67 |
int sysctl_x25_forward = 0; |
1da177e4c Linux-2.6.12-rc2 |
68 69 70 |
HLIST_HEAD(x25_list); DEFINE_RWLOCK(x25_list_lock); |
90ddc4f04 [NET]: move struc... |
71 |
static const struct proto_ops x25_proto_ops; |
1da177e4c Linux-2.6.12-rc2 |
72 73 |
static struct x25_address null_x25_address = {" "}; |
1b06e6ba2 [X25]: ioctl conv... |
74 75 76 77 78 79 80 |
#ifdef CONFIG_COMPAT struct compat_x25_subscrip_struct { char device[200-sizeof(compat_ulong_t)]; compat_ulong_t global_facil_mask; compat_uint_t extended; }; #endif |
f5eb917b8 x25: Patch to fix... |
81 82 83 84 85 86 87 88 |
int x25_parse_address_block(struct sk_buff *skb, struct x25_address *called_addr, struct x25_address *calling_addr) { unsigned char len; int needed; int rc; |
cb101ed2c x25: Handle under... |
89 |
if (!pskb_may_pull(skb, 1)) { |
f5eb917b8 x25: Patch to fix... |
90 91 92 93 94 95 96 |
/* packet has no address block */ rc = 0; goto empty; } len = *skb->data; needed = 1 + (len >> 4) + (len & 0x0f); |
cb101ed2c x25: Handle under... |
97 |
if (!pskb_may_pull(skb, needed)) { |
f5eb917b8 x25: Patch to fix... |
98 99 100 101 102 103 104 105 106 107 108 109 110 111 |
/* packet is too short to hold the addresses it claims to hold */ rc = -1; goto empty; } return x25_addr_ntoa(skb->data, called_addr, calling_addr); empty: *called_addr->x25_addr = 0; *calling_addr->x25_addr = 0; return rc; } |
1da177e4c Linux-2.6.12-rc2 |
112 113 114 |
int x25_addr_ntoa(unsigned char *p, struct x25_address *called_addr, struct x25_address *calling_addr) { |
6bf1574ee [X25]: Avoid divi... |
115 |
unsigned int called_len, calling_len; |
1da177e4c Linux-2.6.12-rc2 |
116 |
char *called, *calling; |
6bf1574ee [X25]: Avoid divi... |
117 |
unsigned int i; |
1da177e4c Linux-2.6.12-rc2 |
118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 |
called_len = (*p >> 0) & 0x0F; calling_len = (*p >> 4) & 0x0F; called = called_addr->x25_addr; calling = calling_addr->x25_addr; p++; for (i = 0; i < (called_len + calling_len); i++) { if (i < called_len) { if (i % 2 != 0) { *called++ = ((*p >> 0) & 0x0F) + '0'; p++; } else { *called++ = ((*p >> 4) & 0x0F) + '0'; } } else { if (i % 2 != 0) { *calling++ = ((*p >> 0) & 0x0F) + '0'; p++; } else { *calling++ = ((*p >> 4) & 0x0F) + '0'; } } } *called = *calling = '\0'; return 1 + (called_len + calling_len + 1) / 2; } int x25_addr_aton(unsigned char *p, struct x25_address *called_addr, struct x25_address *calling_addr) { unsigned int called_len, calling_len; char *called, *calling; int i; called = called_addr->x25_addr; calling = calling_addr->x25_addr; called_len = strlen(called); calling_len = strlen(calling); *p++ = (calling_len << 4) | (called_len << 0); for (i = 0; i < (called_len + calling_len); i++) { if (i < called_len) { if (i % 2 != 0) { *p |= (*called++ - '0') << 0; p++; } else { *p = 0x00; *p |= (*called++ - '0') << 4; } } else { if (i % 2 != 0) { *p |= (*calling++ - '0') << 0; p++; } else { *p = 0x00; *p |= (*calling++ - '0') << 4; } } } return 1 + (called_len + calling_len + 1) / 2; } /* * Socket removal during an interrupt is now safe. */ static void x25_remove_socket(struct sock *sk) { write_lock_bh(&x25_list_lock); sk_del_node_init(sk); write_unlock_bh(&x25_list_lock); } /* * Kill all bound sockets on a dropped device. */ static void x25_kill_by_device(struct net_device *dev) { struct sock *s; struct hlist_node *node; write_lock_bh(&x25_list_lock); sk_for_each(s, node, &x25_list) if (x25_sk(s)->neighbour && x25_sk(s)->neighbour->dev == dev) x25_disconnect(s, ENETUNREACH, 0, 0); write_unlock_bh(&x25_list_lock); } /* * Handle device status changes. */ static int x25_device_event(struct notifier_block *this, unsigned long event, void *ptr) { struct net_device *dev = ptr; struct x25_neigh *nb; |
721499e89 netns: Use net_eq... |
222 |
if (!net_eq(dev_net(dev), &init_net)) |
e9dc86534 [NET]: Make devic... |
223 |
return NOTIFY_DONE; |
1da177e4c Linux-2.6.12-rc2 |
224 |
if (dev->type == ARPHRD_X25 |
29c362623 net:x25: use IS_E... |
225 |
#if IS_ENABLED(CONFIG_LLC) |
1da177e4c Linux-2.6.12-rc2 |
226 227 228 229 |
|| dev->type == ARPHRD_ETHER #endif ) { switch (event) { |
fddc5f3e9 x25: Reduce switc... |
230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 |
case NETDEV_UP: x25_link_device_up(dev); break; case NETDEV_GOING_DOWN: nb = x25_get_neigh(dev); if (nb) { x25_terminate_link(nb); x25_neigh_put(nb); } break; case NETDEV_DOWN: x25_kill_by_device(dev); x25_route_device_down(dev); x25_link_device_down(dev); break; |
1da177e4c Linux-2.6.12-rc2 |
245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 |
} } return NOTIFY_DONE; } /* * Add a socket to the bound sockets list. */ static void x25_insert_socket(struct sock *sk) { write_lock_bh(&x25_list_lock); sk_add_node(sk, &x25_list); write_unlock_bh(&x25_list_lock); } /* * Find a socket that wants to accept the Call Request we just * received. Check the full list for an address/cud match. * If no cuds match return the next_best thing, an address match. * Note: if a listening socket has cud set it must only get calls * with matching cud. */ |
cb65d506c [X25]: Selective ... |
268 269 |
static struct sock *x25_find_listener(struct x25_address *addr, struct sk_buff *skb) |
1da177e4c Linux-2.6.12-rc2 |
270 271 272 273 274 275 276 277 278 279 |
{ struct sock *s; struct sock *next_best; struct hlist_node *node; read_lock_bh(&x25_list_lock); next_best = NULL; sk_for_each(s, node, &x25_list) if ((!strcmp(addr->x25_addr, |
cb65d506c [X25]: Selective ... |
280 281 282 283 |
x25_sk(s)->source_addr.x25_addr) || !strcmp(addr->x25_addr, null_x25_address.x25_addr)) && s->sk_state == TCP_LISTEN) { |
1da177e4c Linux-2.6.12-rc2 |
284 285 286 287 |
/* * Found a listening socket, now check the incoming * call user data vs this sockets call user data */ |
7f81e25be x25: Prevent skb ... |
288 289 |
if (x25_sk(s)->cudmatchlength > 0 && skb->len >= x25_sk(s)->cudmatchlength) { |
f8e1d2018 [NET] X25: Fix wh... |
290 291 |
if((memcmp(x25_sk(s)->calluserdata.cuddata, skb->data, |
cb65d506c [X25]: Selective ... |
292 293 294 295 296 |
x25_sk(s)->cudmatchlength)) == 0) { sock_hold(s); goto found; } } else |
1da177e4c Linux-2.6.12-rc2 |
297 |
next_best = s; |
1da177e4c Linux-2.6.12-rc2 |
298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 |
} if (next_best) { s = next_best; sock_hold(s); goto found; } s = NULL; found: read_unlock_bh(&x25_list_lock); return s; } /* * Find a connected X.25 socket given my LCI and neighbour. */ static struct sock *__x25_find_socket(unsigned int lci, struct x25_neigh *nb) { struct sock *s; struct hlist_node *node; sk_for_each(s, node, &x25_list) if (x25_sk(s)->lci == lci && x25_sk(s)->neighbour == nb) { sock_hold(s); goto found; } s = NULL; found: return s; } struct sock *x25_find_socket(unsigned int lci, struct x25_neigh *nb) { struct sock *s; read_lock_bh(&x25_list_lock); s = __x25_find_socket(lci, nb); read_unlock_bh(&x25_list_lock); return s; } /* * Find a unique LCI for a given device. */ static unsigned int x25_new_lci(struct x25_neigh *nb) { unsigned int lci = 1; struct sock *sk; read_lock_bh(&x25_list_lock); while ((sk = __x25_find_socket(lci, nb)) != NULL) { sock_put(sk); if (++lci == 4096) { lci = 0; break; } } read_unlock_bh(&x25_list_lock); return lci; } /* * Deferred destroy. */ |
14ebaf81e x25: Fix sleep fr... |
363 |
static void __x25_destroy_socket(struct sock *); |
1da177e4c Linux-2.6.12-rc2 |
364 365 366 367 368 369 |
/* * handler for deferred kills. */ static void x25_destroy_timer(unsigned long data) { |
14ebaf81e x25: Fix sleep fr... |
370 |
x25_destroy_socket_from_timer((struct sock *)data); |
1da177e4c Linux-2.6.12-rc2 |
371 372 373 374 375 376 377 378 379 |
} /* * This is called from user mode and the timers. Thus it protects itself * against interrupt users but doesn't worry about being called during * work. Once it is removed from the queue no interrupt or bottom half * will touch it and we are (fairly 8-) ) safe. * Not static as it's used by the timer */ |
14ebaf81e x25: Fix sleep fr... |
380 |
static void __x25_destroy_socket(struct sock *sk) |
1da177e4c Linux-2.6.12-rc2 |
381 382 |
{ struct sk_buff *skb; |
1da177e4c Linux-2.6.12-rc2 |
383 384 385 386 387 388 389 390 391 392 393 |
x25_stop_heartbeat(sk); x25_stop_timer(sk); x25_remove_socket(sk); x25_clear_queues(sk); /* Flush the queues */ while ((skb = skb_dequeue(&sk->sk_receive_queue)) != NULL) { if (skb->sk != sk) { /* A pending connection */ /* * Queue the unaccepted socket for death */ |
2cec6b014 X25 fix dead unac... |
394 |
skb->sk->sk_state = TCP_LISTEN; |
1da177e4c Linux-2.6.12-rc2 |
395 396 397 398 399 400 401 |
sock_set_flag(skb->sk, SOCK_DEAD); x25_start_heartbeat(skb->sk); x25_sk(skb->sk)->state = X25_STATE_0; } kfree_skb(skb); } |
c564039fd net: sk_wmem_allo... |
402 |
if (sk_has_allocations(sk)) { |
1da177e4c Linux-2.6.12-rc2 |
403 404 405 406 407 408 409 410 411 |
/* Defer: outstanding buffers */ sk->sk_timer.expires = jiffies + 10 * HZ; sk->sk_timer.function = x25_destroy_timer; sk->sk_timer.data = (unsigned long)sk; add_timer(&sk->sk_timer); } else { /* drop last reference so sock_put will free */ __sock_put(sk); } |
14ebaf81e x25: Fix sleep fr... |
412 |
} |
1da177e4c Linux-2.6.12-rc2 |
413 |
|
14ebaf81e x25: Fix sleep fr... |
414 415 416 417 418 419 420 421 |
void x25_destroy_socket_from_timer(struct sock *sk) { sock_hold(sk); bh_lock_sock(sk); __x25_destroy_socket(sk); bh_unlock_sock(sk); sock_put(sk); } |
1da177e4c Linux-2.6.12-rc2 |
422 423 424 425 426 427 |
/* * Handling for system calls applied via the various interfaces to a * X.25 socket object. */ static int x25_setsockopt(struct socket *sock, int level, int optname, |
b7058842c net: Make setsock... |
428 |
char __user *optval, unsigned int optlen) |
1da177e4c Linux-2.6.12-rc2 |
429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 |
{ int opt; struct sock *sk = sock->sk; int rc = -ENOPROTOOPT; if (level != SOL_X25 || optname != X25_QBITINCL) goto out; rc = -EINVAL; if (optlen < sizeof(int)) goto out; rc = -EFAULT; if (get_user(opt, (int __user *)optval)) goto out; |
cb863ffd4 X25: Move qbit fl... |
444 445 446 447 |
if (opt) set_bit(X25_Q_BIT_FLAG, &x25_sk(sk)->flags); else clear_bit(X25_Q_BIT_FLAG, &x25_sk(sk)->flags); |
1da177e4c Linux-2.6.12-rc2 |
448 449 450 451 452 453 454 455 456 457 |
rc = 0; out: return rc; } static int x25_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen) { struct sock *sk = sock->sk; int val, len, rc = -ENOPROTOOPT; |
f8e1d2018 [NET] X25: Fix wh... |
458 |
|
1da177e4c Linux-2.6.12-rc2 |
459 460 461 462 463 464 465 466 467 468 469 470 |
if (level != SOL_X25 || optname != X25_QBITINCL) goto out; rc = -EFAULT; if (get_user(len, optlen)) goto out; len = min_t(unsigned int, len, sizeof(int)); rc = -EINVAL; if (len < 0) goto out; |
f8e1d2018 [NET] X25: Fix wh... |
471 |
|
1da177e4c Linux-2.6.12-rc2 |
472 473 474 |
rc = -EFAULT; if (put_user(len, optlen)) goto out; |
cb863ffd4 X25: Move qbit fl... |
475 |
val = test_bit(X25_Q_BIT_FLAG, &x25_sk(sk)->flags); |
1da177e4c Linux-2.6.12-rc2 |
476 477 478 479 480 481 482 483 484 |
rc = copy_to_user(optval, &val, len) ? -EFAULT : 0; out: return rc; } static int x25_listen(struct socket *sock, int backlog) { struct sock *sk = sock->sk; int rc = -EOPNOTSUPP; |
25aa4efe4 X.25 remove bkl i... |
485 |
lock_sock(sk); |
1da177e4c Linux-2.6.12-rc2 |
486 487 488 489 490 491 |
if (sk->sk_state != TCP_LISTEN) { memset(&x25_sk(sk)->dest_addr, 0, X25_ADDR_LEN); sk->sk_max_ack_backlog = backlog; sk->sk_state = TCP_LISTEN; rc = 0; } |
25aa4efe4 X.25 remove bkl i... |
492 |
release_sock(sk); |
1da177e4c Linux-2.6.12-rc2 |
493 494 495 496 497 498 499 500 501 |
return rc; } static struct proto x25_proto = { .name = "X25", .owner = THIS_MODULE, .obj_size = sizeof(struct x25_sock), }; |
1b8d7ae42 [NET]: Make socke... |
502 |
static struct sock *x25_alloc_socket(struct net *net) |
1da177e4c Linux-2.6.12-rc2 |
503 504 |
{ struct x25_sock *x25; |
6257ff217 [NET]: Forget the... |
505 |
struct sock *sk = sk_alloc(net, AF_X25, GFP_ATOMIC, &x25_proto); |
1da177e4c Linux-2.6.12-rc2 |
506 507 508 509 510 511 512 513 514 515 516 517 518 519 |
if (!sk) goto out; sock_init_data(NULL, sk); x25 = x25_sk(sk); skb_queue_head_init(&x25->ack_queue); skb_queue_head_init(&x25->fragment_queue); skb_queue_head_init(&x25->interrupt_in_queue); skb_queue_head_init(&x25->interrupt_out_queue); out: return sk; } |
3f378b684 net: pass kern to... |
520 521 |
static int x25_create(struct net *net, struct socket *sock, int protocol, int kern) |
1da177e4c Linux-2.6.12-rc2 |
522 523 524 |
{ struct sock *sk; struct x25_sock *x25; |
b18e7a068 X25: Fix x25_crea... |
525 |
int rc = -EAFNOSUPPORT; |
1da177e4c Linux-2.6.12-rc2 |
526 |
|
09ad9bc75 net: use net_eq t... |
527 |
if (!net_eq(net, &init_net)) |
b18e7a068 X25: Fix x25_crea... |
528 529 530 531 532 |
goto out; rc = -ESOCKTNOSUPPORT; if (sock->type != SOCK_SEQPACKET) goto out; |
1b8d7ae42 [NET]: Make socke... |
533 |
|
b18e7a068 X25: Fix x25_crea... |
534 535 |
rc = -EINVAL; if (protocol) |
1da177e4c Linux-2.6.12-rc2 |
536 |
goto out; |
b18e7a068 X25: Fix x25_crea... |
537 |
rc = -ENOBUFS; |
1b8d7ae42 [NET]: Make socke... |
538 |
if ((sk = x25_alloc_socket(net)) == NULL) |
1da177e4c Linux-2.6.12-rc2 |
539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 |
goto out; x25 = x25_sk(sk); sock_init_data(sock, sk); x25_init_timers(sk); sock->ops = &x25_proto_ops; sk->sk_protocol = protocol; sk->sk_backlog_rcv = x25_backlog_rcv; x25->t21 = sysctl_x25_call_request_timeout; x25->t22 = sysctl_x25_reset_request_timeout; x25->t23 = sysctl_x25_clear_request_timeout; x25->t2 = sysctl_x25_ack_holdback_timeout; x25->state = X25_STATE_0; |
cb65d506c [X25]: Selective ... |
556 |
x25->cudmatchlength = 0; |
37cda7874 X25: Move accept ... |
557 |
set_bit(X25_ACCPT_APPRV_FLAG, &x25->flags); /* normally no cud */ |
ebc3f64b8 [X25]: Fast selec... |
558 |
/* on call accept */ |
1da177e4c Linux-2.6.12-rc2 |
559 560 561 562 563 |
x25->facilities.winsize_in = X25_DEFAULT_WINDOW_SIZE; x25->facilities.winsize_out = X25_DEFAULT_WINDOW_SIZE; x25->facilities.pacsize_in = X25_DEFAULT_PACKET_SIZE; x25->facilities.pacsize_out = X25_DEFAULT_PACKET_SIZE; |
ddd0451fc x.25 attempts to ... |
564 565 |
x25->facilities.throughput = 0; /* by default don't negotiate throughput */ |
1da177e4c Linux-2.6.12-rc2 |
566 |
x25->facilities.reverse = X25_DEFAULT_REVERSE; |
f8e1d2018 [NET] X25: Fix wh... |
567 568 569 570 571 572 |
x25->dte_facilities.calling_len = 0; x25->dte_facilities.called_len = 0; memset(x25->dte_facilities.called_ae, '\0', sizeof(x25->dte_facilities.called_ae)); memset(x25->dte_facilities.calling_ae, '\0', sizeof(x25->dte_facilities.calling_ae)); |
a64b7b936 [X25]: allow ITU-... |
573 |
|
1da177e4c Linux-2.6.12-rc2 |
574 575 576 577 578 579 580 581 582 583 584 585 |
rc = 0; out: return rc; } static struct sock *x25_make_new(struct sock *osk) { struct sock *sk = NULL; struct x25_sock *x25, *ox25; if (osk->sk_type != SOCK_SEQPACKET) goto out; |
3b1e0a655 [NET] NETNS: Omit... |
586 |
if ((sk = x25_alloc_socket(sock_net(osk))) == NULL) |
1da177e4c Linux-2.6.12-rc2 |
587 588 589 590 591 |
goto out; x25 = x25_sk(sk); sk->sk_type = osk->sk_type; |
1da177e4c Linux-2.6.12-rc2 |
592 593 594 595 596 |
sk->sk_priority = osk->sk_priority; sk->sk_protocol = osk->sk_protocol; sk->sk_rcvbuf = osk->sk_rcvbuf; sk->sk_sndbuf = osk->sk_sndbuf; sk->sk_state = TCP_ESTABLISHED; |
1da177e4c Linux-2.6.12-rc2 |
597 |
sk->sk_backlog_rcv = osk->sk_backlog_rcv; |
a20a85547 [X25]: Fix for br... |
598 |
sock_copy_flags(sk, osk); |
1da177e4c Linux-2.6.12-rc2 |
599 600 601 602 603 604 |
ox25 = x25_sk(osk); x25->t21 = ox25->t21; x25->t22 = ox25->t22; x25->t23 = ox25->t23; x25->t2 = ox25->t2; |
cb863ffd4 X25: Move qbit fl... |
605 |
x25->flags = ox25->flags; |
1da177e4c Linux-2.6.12-rc2 |
606 |
x25->facilities = ox25->facilities; |
a64b7b936 [X25]: allow ITU-... |
607 |
x25->dte_facilities = ox25->dte_facilities; |
cb65d506c [X25]: Selective ... |
608 |
x25->cudmatchlength = ox25->cudmatchlength; |
1da177e4c Linux-2.6.12-rc2 |
609 |
|
b7792e34c X25: Move interru... |
610 |
clear_bit(X25_INTERRUPT_FLAG, &x25->flags); |
1da177e4c Linux-2.6.12-rc2 |
611 612 613 614 615 616 617 618 619 620 621 |
x25_init_timers(sk); out: return sk; } static int x25_release(struct socket *sock) { struct sock *sk = sock->sk; struct x25_sock *x25; if (!sk) |
77b228360 x25: remove the BKL |
622 |
return 0; |
1da177e4c Linux-2.6.12-rc2 |
623 624 |
x25 = x25_sk(sk); |
77b228360 x25: remove the BKL |
625 626 |
sock_hold(sk); lock_sock(sk); |
1da177e4c Linux-2.6.12-rc2 |
627 628 629 630 631 |
switch (x25->state) { case X25_STATE_0: case X25_STATE_2: x25_disconnect(sk, 0, 0, 0); |
77b228360 x25: remove the BKL |
632 |
__x25_destroy_socket(sk); |
1da177e4c Linux-2.6.12-rc2 |
633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 |
goto out; case X25_STATE_1: case X25_STATE_3: case X25_STATE_4: x25_clear_queues(sk); x25_write_internal(sk, X25_CLEAR_REQUEST); x25_start_t23timer(sk); x25->state = X25_STATE_2; sk->sk_state = TCP_CLOSE; sk->sk_shutdown |= SEND_SHUTDOWN; sk->sk_state_change(sk); sock_set_flag(sk, SOCK_DEAD); sock_set_flag(sk, SOCK_DESTROY); break; } |
c751e4f8b x25: Use sock_orp... |
649 |
sock_orphan(sk); |
1da177e4c Linux-2.6.12-rc2 |
650 |
out: |
77b228360 x25: remove the BKL |
651 652 |
release_sock(sk); sock_put(sk); |
1da177e4c Linux-2.6.12-rc2 |
653 654 655 656 657 658 659 |
return 0; } static int x25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) { struct sock *sk = sock->sk; struct sockaddr_x25 *addr = (struct sockaddr_x25 *)uaddr; |
a9288525d X25: Dont let x25... |
660 |
int len, i, rc = 0; |
1da177e4c Linux-2.6.12-rc2 |
661 662 663 |
if (!sock_flag(sk, SOCK_ZAPPED) || addr_len != sizeof(struct sockaddr_x25) || |
91774904f net/x25: push BKL... |
664 665 666 667 |
addr->sx25_family != AF_X25) { rc = -EINVAL; goto out; } |
1da177e4c Linux-2.6.12-rc2 |
668 |
|
a9288525d X25: Dont let x25... |
669 670 671 672 673 674 675 |
len = strlen(addr->sx25_addr.x25_addr); for (i = 0; i < len; i++) { if (!isdigit(addr->sx25_addr.x25_addr[i])) { rc = -EINVAL; goto out; } } |
90c27297a X.25 remove bkl i... |
676 |
lock_sock(sk); |
1da177e4c Linux-2.6.12-rc2 |
677 678 679 |
x25_sk(sk)->source_addr = addr->sx25_addr; x25_insert_socket(sk); sock_reset_flag(sk, SOCK_ZAPPED); |
90c27297a X.25 remove bkl i... |
680 |
release_sock(sk); |
1da177e4c Linux-2.6.12-rc2 |
681 682 |
SOCK_DEBUG(sk, "x25_bind: socket is bound "); |
91774904f net/x25: push BKL... |
683 |
out: |
91774904f net/x25: push BKL... |
684 |
return rc; |
1da177e4c Linux-2.6.12-rc2 |
685 686 687 688 689 |
} static int x25_wait_for_connection_establishment(struct sock *sk) { DECLARE_WAITQUEUE(wait, current); |
f8e1d2018 [NET] X25: Fix wh... |
690 |
int rc; |
1da177e4c Linux-2.6.12-rc2 |
691 |
|
aa3951451 net: sk_sleep() h... |
692 |
add_wait_queue_exclusive(sk_sleep(sk), &wait); |
1da177e4c Linux-2.6.12-rc2 |
693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 |
for (;;) { __set_current_state(TASK_INTERRUPTIBLE); rc = -ERESTARTSYS; if (signal_pending(current)) break; rc = sock_error(sk); if (rc) { sk->sk_socket->state = SS_UNCONNECTED; break; } rc = 0; if (sk->sk_state != TCP_ESTABLISHED) { release_sock(sk); schedule(); lock_sock(sk); } else break; } __set_current_state(TASK_RUNNING); |
aa3951451 net: sk_sleep() h... |
712 |
remove_wait_queue(sk_sleep(sk), &wait); |
1da177e4c Linux-2.6.12-rc2 |
713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 |
return rc; } static int x25_connect(struct socket *sock, struct sockaddr *uaddr, int addr_len, int flags) { struct sock *sk = sock->sk; struct x25_sock *x25 = x25_sk(sk); struct sockaddr_x25 *addr = (struct sockaddr_x25 *)uaddr; struct x25_route *rt; int rc = 0; lock_sock(sk); if (sk->sk_state == TCP_ESTABLISHED && sock->state == SS_CONNECTING) { sock->state = SS_CONNECTED; goto out; /* Connect completed during a ERESTARTSYS event */ } rc = -ECONNREFUSED; if (sk->sk_state == TCP_CLOSE && sock->state == SS_CONNECTING) { sock->state = SS_UNCONNECTED; goto out; } rc = -EISCONN; /* No reconnect on a seqpacket socket */ if (sk->sk_state == TCP_ESTABLISHED) goto out; |
f8e1d2018 [NET] X25: Fix wh... |
740 |
sk->sk_state = TCP_CLOSE; |
1da177e4c Linux-2.6.12-rc2 |
741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 |
sock->state = SS_UNCONNECTED; rc = -EINVAL; if (addr_len != sizeof(struct sockaddr_x25) || addr->sx25_family != AF_X25) goto out; rc = -ENETUNREACH; rt = x25_get_route(&addr->sx25_addr); if (!rt) goto out; x25->neighbour = x25_get_neigh(rt->dev); if (!x25->neighbour) goto out_put_route; x25_limit_facilities(&x25->facilities, x25->neighbour); x25->lci = x25_new_lci(x25->neighbour); if (!x25->lci) goto out_put_neigh; rc = -EINVAL; if (sock_flag(sk, SOCK_ZAPPED)) /* Must bind first - autobinding does not work */ goto out_put_neigh; if (!strcmp(x25->source_addr.x25_addr, null_x25_address.x25_addr)) memset(&x25->source_addr, '\0', X25_ADDR_LEN); x25->dest_addr = addr->sx25_addr; /* Move to connecting socket, start sending Connect Requests */ sock->state = SS_CONNECTING; sk->sk_state = TCP_SYN_SENT; x25->state = X25_STATE_1; x25_write_internal(sk, X25_CALL_REQUEST); x25_start_heartbeat(sk); x25_start_t21timer(sk); /* Now the loop */ rc = -EINPROGRESS; if (sk->sk_state != TCP_ESTABLISHED && (flags & O_NONBLOCK)) goto out_put_neigh; rc = x25_wait_for_connection_establishment(sk); if (rc) goto out_put_neigh; sock->state = SS_CONNECTED; rc = 0; out_put_neigh: if (rc) x25_neigh_put(x25->neighbour); out_put_route: x25_route_put(rt); out: release_sock(sk); return rc; } |
bac37ec83 [X25]: fix kernel... |
803 |
static int x25_wait_for_data(struct sock *sk, long timeout) |
1da177e4c Linux-2.6.12-rc2 |
804 805 806 |
{ DECLARE_WAITQUEUE(wait, current); int rc = 0; |
aa3951451 net: sk_sleep() h... |
807 |
add_wait_queue_exclusive(sk_sleep(sk), &wait); |
1da177e4c Linux-2.6.12-rc2 |
808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 |
for (;;) { __set_current_state(TASK_INTERRUPTIBLE); if (sk->sk_shutdown & RCV_SHUTDOWN) break; rc = -ERESTARTSYS; if (signal_pending(current)) break; rc = -EAGAIN; if (!timeout) break; rc = 0; if (skb_queue_empty(&sk->sk_receive_queue)) { release_sock(sk); timeout = schedule_timeout(timeout); lock_sock(sk); } else break; } __set_current_state(TASK_RUNNING); |
aa3951451 net: sk_sleep() h... |
827 |
remove_wait_queue(sk_sleep(sk), &wait); |
1da177e4c Linux-2.6.12-rc2 |
828 829 |
return rc; } |
f8e1d2018 [NET] X25: Fix wh... |
830 |
|
1da177e4c Linux-2.6.12-rc2 |
831 832 833 834 835 836 |
static int x25_accept(struct socket *sock, struct socket *newsock, int flags) { struct sock *sk = sock->sk; struct sock *newsk; struct sk_buff *skb; int rc = -EINVAL; |
141646ce5 X.25 remove bkl i... |
837 |
if (!sk) |
1da177e4c Linux-2.6.12-rc2 |
838 839 840 841 842 843 844 |
goto out; rc = -EOPNOTSUPP; if (sk->sk_type != SOCK_SEQPACKET) goto out; lock_sock(sk); |
141646ce5 X.25 remove bkl i... |
845 846 847 |
rc = -EINVAL; if (sk->sk_state != TCP_LISTEN) goto out2; |
1da177e4c Linux-2.6.12-rc2 |
848 849 850 851 852 853 854 855 |
rc = x25_wait_for_data(sk, sk->sk_rcvtimeo); if (rc) goto out2; skb = skb_dequeue(&sk->sk_receive_queue); rc = -EINVAL; if (!skb->sk) goto out2; newsk = skb->sk; |
b61d38e05 x25: Use sock_gra... |
856 |
sock_graft(newsk, newsock); |
1da177e4c Linux-2.6.12-rc2 |
857 858 859 860 861 |
/* Now attach up the new socket */ skb->sk = NULL; kfree_skb(skb); sk->sk_ack_backlog--; |
1da177e4c Linux-2.6.12-rc2 |
862 863 864 865 866 867 868 869 870 871 872 873 874 875 |
newsock->state = SS_CONNECTED; rc = 0; out2: release_sock(sk); out: return rc; } static int x25_getname(struct socket *sock, struct sockaddr *uaddr, int *uaddr_len, int peer) { struct sockaddr_x25 *sx25 = (struct sockaddr_x25 *)uaddr; struct sock *sk = sock->sk; struct x25_sock *x25 = x25_sk(sk); |
91774904f net/x25: push BKL... |
876 |
int rc = 0; |
1da177e4c Linux-2.6.12-rc2 |
877 878 |
if (peer) { |
91774904f net/x25: push BKL... |
879 880 881 882 |
if (sk->sk_state != TCP_ESTABLISHED) { rc = -ENOTCONN; goto out; } |
1da177e4c Linux-2.6.12-rc2 |
883 884 885 886 887 888 |
sx25->sx25_addr = x25->dest_addr; } else sx25->sx25_addr = x25->source_addr; sx25->sx25_family = AF_X25; *uaddr_len = sizeof(*sx25); |
91774904f net/x25: push BKL... |
889 |
out: |
91774904f net/x25: push BKL... |
890 891 |
return rc; } |
1da177e4c Linux-2.6.12-rc2 |
892 893 894 895 896 897 898 899 |
int x25_rx_call_request(struct sk_buff *skb, struct x25_neigh *nb, unsigned int lci) { struct sock *sk; struct sock *make; struct x25_sock *makex25; struct x25_address source_addr, dest_addr; struct x25_facilities facilities; |
a64b7b936 [X25]: allow ITU-... |
900 |
struct x25_dte_facilities dte_facilities; |
95a9dc439 [X.25]: Add call ... |
901 |
int len, addr_len, rc; |
1da177e4c Linux-2.6.12-rc2 |
902 903 904 905 906 907 908 909 910 |
/* * Remove the LCI and frame type. */ skb_pull(skb, X25_STD_MIN_LEN); /* * Extract the X.25 addresses and convert them to ASCII strings, * and remove them. |
f5eb917b8 x25: Patch to fix... |
911 912 |
* * Address block is mandatory in call request packets |
1da177e4c Linux-2.6.12-rc2 |
913 |
*/ |
f5eb917b8 x25: Patch to fix... |
914 915 916 |
addr_len = x25_parse_address_block(skb, &source_addr, &dest_addr); if (addr_len <= 0) goto out_clear_request; |
95a9dc439 [X.25]: Add call ... |
917 |
skb_pull(skb, addr_len); |
1da177e4c Linux-2.6.12-rc2 |
918 919 920 921 922 |
/* * Get the length of the facilities, skip past them for the moment * get the call user data because this is needed to determine * the correct listener |
f5eb917b8 x25: Patch to fix... |
923 924 |
* * Facilities length is mandatory in call request packets |
1da177e4c Linux-2.6.12-rc2 |
925 |
*/ |
cb101ed2c x25: Handle under... |
926 |
if (!pskb_may_pull(skb, 1)) |
f5eb917b8 x25: Patch to fix... |
927 |
goto out_clear_request; |
1da177e4c Linux-2.6.12-rc2 |
928 |
len = skb->data[0] + 1; |
cb101ed2c x25: Handle under... |
929 |
if (!pskb_may_pull(skb, len)) |
f5eb917b8 x25: Patch to fix... |
930 |
goto out_clear_request; |
1da177e4c Linux-2.6.12-rc2 |
931 932 933 |
skb_pull(skb,len); /* |
c7fd0d48b x25: Validate inc... |
934 935 936 937 938 939 |
* Ensure that the amount of call user data is valid. */ if (skb->len > X25_MAX_CUD_LEN) goto out_clear_request; /* |
cb101ed2c x25: Handle under... |
940 941 942 943 944 945 946 |
* Get all the call user data so it can be used in * x25_find_listener and skb_copy_from_linear_data up ahead. */ if (!pskb_may_pull(skb, skb->len)) goto out_clear_request; /* |
1da177e4c Linux-2.6.12-rc2 |
947 948 |
* Find a listener for the particular address/cud pair. */ |
cb65d506c [X25]: Selective ... |
949 950 |
sk = x25_find_listener(&source_addr,skb); skb_push(skb,len); |
1da177e4c Linux-2.6.12-rc2 |
951 |
|
95a9dc439 [X.25]: Add call ... |
952 953 954 |
if (sk != NULL && sk_acceptq_is_full(sk)) { goto out_sock_put; } |
1da177e4c Linux-2.6.12-rc2 |
955 |
/* |
95a9dc439 [X.25]: Add call ... |
956 957 |
* We dont have any listeners for this incoming call. * Try forwarding it. |
1da177e4c Linux-2.6.12-rc2 |
958 |
*/ |
95a9dc439 [X.25]: Add call ... |
959 960 |
if (sk == NULL) { skb_push(skb, addr_len + X25_STD_MIN_LEN); |
39e21c0d3 [X.25]: Adds /pro... |
961 962 |
if (sysctl_x25_forward && x25_forward_call(&dest_addr, nb, skb, lci) > 0) |
95a9dc439 [X.25]: Add call ... |
963 964 965 966 967 968 969 970 971 972 |
{ /* Call was forwarded, dont process it any more */ kfree_skb(skb); rc = 1; goto out; } else { /* No listeners, can't forward, clear the call */ goto out_clear_request; } } |
1da177e4c Linux-2.6.12-rc2 |
973 974 975 976 |
/* * Try to reach a compromise on the requested facilities. */ |
a64b7b936 [X25]: allow ITU-... |
977 978 |
len = x25_negotiate_facilities(skb, sk, &facilities, &dte_facilities); if (len == -1) |
1da177e4c Linux-2.6.12-rc2 |
979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 |
goto out_sock_put; /* * current neighbour/link might impose additional limits * on certain facilties */ x25_limit_facilities(&facilities, nb); /* * Try to create a new socket. */ make = x25_make_new(sk); if (!make) goto out_sock_put; /* * Remove the facilities */ skb_pull(skb, len); skb->sk = make; make->sk_state = TCP_ESTABLISHED; makex25 = x25_sk(make); makex25->lci = lci; makex25->dest_addr = dest_addr; makex25->source_addr = source_addr; makex25->neighbour = nb; makex25->facilities = facilities; |
a64b7b936 [X25]: allow ITU-... |
1009 |
makex25->dte_facilities= dte_facilities; |
1da177e4c Linux-2.6.12-rc2 |
1010 |
makex25->vc_facil_mask = x25_sk(sk)->vc_facil_mask; |
cb65d506c [X25]: Selective ... |
1011 1012 |
/* ensure no reverse facil on accept */ makex25->vc_facil_mask &= ~X25_MASK_REVERSE; |
a64b7b936 [X25]: allow ITU-... |
1013 1014 |
/* ensure no calling address extension on accept */ makex25->vc_facil_mask &= ~X25_MASK_CALLING_AE; |
cb65d506c [X25]: Selective ... |
1015 |
makex25->cudmatchlength = x25_sk(sk)->cudmatchlength; |
1da177e4c Linux-2.6.12-rc2 |
1016 |
|
37cda7874 X25: Move accept ... |
1017 1018 |
/* Normally all calls are accepted immediately */ if (test_bit(X25_ACCPT_APPRV_FLAG, &makex25->flags)) { |
ebc3f64b8 [X25]: Fast selec... |
1019 1020 1021 |
x25_write_internal(make, X25_CALL_ACCEPTED); makex25->state = X25_STATE_3; } |
1da177e4c Linux-2.6.12-rc2 |
1022 |
|
cb65d506c [X25]: Selective ... |
1023 1024 1025 |
/* * Incoming Call User Data. */ |
8db09f26f x25: '< 0' and '>... |
1026 1027 |
skb_copy_from_linear_data(skb, makex25->calluserdata.cuddata, skb->len); makex25->calluserdata.cudlength = skb->len; |
cb65d506c [X25]: Selective ... |
1028 |
|
1da177e4c Linux-2.6.12-rc2 |
1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 |
sk->sk_ack_backlog++; x25_insert_socket(make); skb_queue_head(&sk->sk_receive_queue, skb); x25_start_heartbeat(make); if (!sock_flag(sk, SOCK_DEAD)) sk->sk_data_ready(sk, skb->len); rc = 1; sock_put(sk); out: return rc; out_sock_put: sock_put(sk); out_clear_request: rc = 0; x25_transmit_clear_request(nb, lci, 0x01); goto out; } static int x25_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, size_t len) { struct sock *sk = sock->sk; struct x25_sock *x25 = x25_sk(sk); struct sockaddr_x25 *usx25 = (struct sockaddr_x25 *)msg->msg_name; struct sockaddr_x25 sx25; struct sk_buff *skb; unsigned char *asmptr; int noblock = msg->msg_flags & MSG_DONTWAIT; size_t size; int qbit = 0, rc = -EINVAL; |
77b228360 x25: remove the BKL |
1063 |
lock_sock(sk); |
1da177e4c Linux-2.6.12-rc2 |
1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 |
if (msg->msg_flags & ~(MSG_DONTWAIT|MSG_OOB|MSG_EOR|MSG_CMSG_COMPAT)) goto out; /* we currently don't support segmented records at the user interface */ if (!(msg->msg_flags & (MSG_EOR|MSG_OOB))) goto out; rc = -EADDRNOTAVAIL; if (sock_flag(sk, SOCK_ZAPPED)) goto out; rc = -EPIPE; if (sk->sk_shutdown & SEND_SHUTDOWN) { send_sig(SIGPIPE, current, 0); goto out; } rc = -ENETUNREACH; if (!x25->neighbour) goto out; if (usx25) { rc = -EINVAL; if (msg->msg_namelen < sizeof(sx25)) goto out; memcpy(&sx25, usx25, sizeof(sx25)); rc = -EISCONN; if (strcmp(x25->dest_addr.x25_addr, sx25.sx25_addr.x25_addr)) goto out; rc = -EINVAL; if (sx25.sx25_family != AF_X25) goto out; } else { /* * FIXME 1003.1g - if the socket is like this because * it has become closed (not started closed) we ought * to SIGPIPE, EPIPE; */ rc = -ENOTCONN; if (sk->sk_state != TCP_ESTABLISHED) goto out; sx25.sx25_family = AF_X25; sx25.sx25_addr = x25->dest_addr; } |
83e0bbcbe af_rose/x25: Sani... |
1109 1110 1111 1112 1113 |
/* Sanity check the packet size */ if (len > 65535) { rc = -EMSGSIZE; goto out; } |
1da177e4c Linux-2.6.12-rc2 |
1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 |
SOCK_DEBUG(sk, "x25_sendmsg: sendto: Addresses built. "); /* Build a packet */ SOCK_DEBUG(sk, "x25_sendmsg: sendto: building packet. "); if ((msg->msg_flags & MSG_OOB) && len > 32) len = 32; size = len + X25_MAX_L2_LEN + X25_EXT_MIN_LEN; |
77b228360 x25: remove the BKL |
1125 |
release_sock(sk); |
1da177e4c Linux-2.6.12-rc2 |
1126 |
skb = sock_alloc_send_skb(sk, size, noblock, &rc); |
77b228360 x25: remove the BKL |
1127 |
lock_sock(sk); |
1da177e4c Linux-2.6.12-rc2 |
1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 |
if (!skb) goto out; X25_SKB_CB(skb)->flags = msg->msg_flags; skb_reserve(skb, X25_MAX_L2_LEN + X25_EXT_MIN_LEN); /* * Put the data on the end */ SOCK_DEBUG(sk, "x25_sendmsg: Copying user data "); |
eeeb03745 [SK_BUFF]: More s... |
1139 1140 |
skb_reset_transport_header(skb); skb_put(skb, len); |
1da177e4c Linux-2.6.12-rc2 |
1141 |
|
eeeb03745 [SK_BUFF]: More s... |
1142 |
rc = memcpy_fromiovec(skb_transport_header(skb), msg->msg_iov, len); |
1da177e4c Linux-2.6.12-rc2 |
1143 1144 1145 1146 1147 1148 1149 |
if (rc) goto out_kfree_skb; /* * If the Q BIT Include socket option is in force, the first * byte of the user data is the logical value of the Q Bit. */ |
cb863ffd4 X25: Move qbit fl... |
1150 |
if (test_bit(X25_Q_BIT_FLAG, &x25->flags)) { |
cb101ed2c x25: Handle under... |
1151 1152 |
if (!pskb_may_pull(skb, 1)) goto out_kfree_skb; |
1da177e4c Linux-2.6.12-rc2 |
1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 |
qbit = skb->data[0]; skb_pull(skb, 1); } /* * Push down the X.25 header */ SOCK_DEBUG(sk, "x25_sendmsg: Building X.25 Header. "); if (msg->msg_flags & MSG_OOB) { if (x25->neighbour->extended) { asmptr = skb_push(skb, X25_STD_MIN_LEN); *asmptr++ = ((x25->lci >> 8) & 0x0F) | X25_GFI_EXTSEQ; *asmptr++ = (x25->lci >> 0) & 0xFF; *asmptr++ = X25_INTERRUPT; } else { asmptr = skb_push(skb, X25_STD_MIN_LEN); *asmptr++ = ((x25->lci >> 8) & 0x0F) | X25_GFI_STDSEQ; *asmptr++ = (x25->lci >> 0) & 0xFF; *asmptr++ = X25_INTERRUPT; } } else { if (x25->neighbour->extended) { /* Build an Extended X.25 header */ asmptr = skb_push(skb, X25_EXT_MIN_LEN); *asmptr++ = ((x25->lci >> 8) & 0x0F) | X25_GFI_EXTSEQ; *asmptr++ = (x25->lci >> 0) & 0xFF; *asmptr++ = X25_DATA; *asmptr++ = X25_DATA; } else { /* Build an Standard X.25 header */ asmptr = skb_push(skb, X25_STD_MIN_LEN); *asmptr++ = ((x25->lci >> 8) & 0x0F) | X25_GFI_STDSEQ; *asmptr++ = (x25->lci >> 0) & 0xFF; *asmptr++ = X25_DATA; } if (qbit) skb->data[0] |= X25_Q_BIT; } SOCK_DEBUG(sk, "x25_sendmsg: Built header. "); SOCK_DEBUG(sk, "x25_sendmsg: Transmitting buffer "); rc = -ENOTCONN; if (sk->sk_state != TCP_ESTABLISHED) goto out_kfree_skb; if (msg->msg_flags & MSG_OOB) skb_queue_tail(&x25->interrupt_out_queue, skb); else { |
8db09f26f x25: '< 0' and '>... |
1207 1208 1209 |
rc = x25_output(sk, skb); len = rc; if (rc < 0) |
1da177e4c Linux-2.6.12-rc2 |
1210 |
kfree_skb(skb); |
cb863ffd4 X25: Move qbit fl... |
1211 |
else if (test_bit(X25_Q_BIT_FLAG, &x25->flags)) |
1da177e4c Linux-2.6.12-rc2 |
1212 1213 |
len++; } |
1da177e4c Linux-2.6.12-rc2 |
1214 |
x25_kick(sk); |
1da177e4c Linux-2.6.12-rc2 |
1215 1216 |
rc = len; out: |
77b228360 x25: remove the BKL |
1217 |
release_sock(sk); |
1da177e4c Linux-2.6.12-rc2 |
1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 |
return rc; out_kfree_skb: kfree_skb(skb); goto out; } static int x25_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, size_t size, int flags) { struct sock *sk = sock->sk; struct x25_sock *x25 = x25_sk(sk); struct sockaddr_x25 *sx25 = (struct sockaddr_x25 *)msg->msg_name; size_t copied; |
501e89d3a x25: Fix NULL der... |
1233 |
int qbit, header_len; |
1da177e4c Linux-2.6.12-rc2 |
1234 1235 1236 |
struct sk_buff *skb; unsigned char *asmptr; int rc = -ENOTCONN; |
77b228360 x25: remove the BKL |
1237 |
lock_sock(sk); |
501e89d3a x25: Fix NULL der... |
1238 1239 1240 1241 1242 1243 |
if (x25->neighbour == NULL) goto out; header_len = x25->neighbour->extended ? X25_EXT_MIN_LEN : X25_STD_MIN_LEN; |
1da177e4c Linux-2.6.12-rc2 |
1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 |
/* * This works for seqpacket too. The receiver has ordered the queue for * us! We do one quick check first though */ if (sk->sk_state != TCP_ESTABLISHED) goto out; if (flags & MSG_OOB) { rc = -EINVAL; if (sock_flag(sk, SOCK_URGINLINE) || !skb_peek(&x25->interrupt_in_queue)) goto out; skb = skb_dequeue(&x25->interrupt_in_queue); |
cb101ed2c x25: Handle under... |
1258 1259 |
if (!pskb_may_pull(skb, X25_STD_MIN_LEN)) goto out_free_dgram; |
1da177e4c Linux-2.6.12-rc2 |
1260 1261 1262 1263 1264 |
skb_pull(skb, X25_STD_MIN_LEN); /* * No Q bit information on Interrupt data. */ |
cb863ffd4 X25: Move qbit fl... |
1265 |
if (test_bit(X25_Q_BIT_FLAG, &x25->flags)) { |
1da177e4c Linux-2.6.12-rc2 |
1266 1267 1268 1269 1270 1271 1272 |
asmptr = skb_push(skb, 1); *asmptr = 0x00; } msg->msg_flags |= MSG_OOB; } else { /* Now we can treat all alike */ |
77b228360 x25: remove the BKL |
1273 |
release_sock(sk); |
1da177e4c Linux-2.6.12-rc2 |
1274 1275 |
skb = skb_recv_datagram(sk, flags & ~MSG_DONTWAIT, flags & MSG_DONTWAIT, &rc); |
77b228360 x25: remove the BKL |
1276 |
lock_sock(sk); |
1da177e4c Linux-2.6.12-rc2 |
1277 1278 |
if (!skb) goto out; |
cb101ed2c x25: Handle under... |
1279 1280 |
if (!pskb_may_pull(skb, header_len)) goto out_free_dgram; |
1da177e4c Linux-2.6.12-rc2 |
1281 |
qbit = (skb->data[0] & X25_Q_BIT) == X25_Q_BIT; |
cb101ed2c x25: Handle under... |
1282 |
skb_pull(skb, header_len); |
1da177e4c Linux-2.6.12-rc2 |
1283 |
|
cb863ffd4 X25: Move qbit fl... |
1284 |
if (test_bit(X25_Q_BIT_FLAG, &x25->flags)) { |
1da177e4c Linux-2.6.12-rc2 |
1285 1286 1287 1288 |
asmptr = skb_push(skb, 1); *asmptr = qbit; } } |
badff6d01 [SK_BUFF]: Introd... |
1289 |
skb_reset_transport_header(skb); |
1da177e4c Linux-2.6.12-rc2 |
1290 1291 1292 1293 1294 1295 |
copied = skb->len; if (copied > size) { copied = size; msg->msg_flags |= MSG_TRUNC; } |
f8e1d2018 [NET] X25: Fix wh... |
1296 |
/* Currently, each datagram always contains a complete record */ |
1da177e4c Linux-2.6.12-rc2 |
1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 |
msg->msg_flags |= MSG_EOR; rc = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied); if (rc) goto out_free_dgram; if (sx25) { sx25->sx25_family = AF_X25; sx25->sx25_addr = x25->dest_addr; } msg->msg_namelen = sizeof(struct sockaddr_x25); |
1da177e4c Linux-2.6.12-rc2 |
1309 |
x25_check_rbuf(sk); |
1da177e4c Linux-2.6.12-rc2 |
1310 1311 1312 1313 |
rc = copied; out_free_dgram: skb_free_datagram(sk, skb); out: |
77b228360 x25: remove the BKL |
1314 |
release_sock(sk); |
1da177e4c Linux-2.6.12-rc2 |
1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 |
return rc; } static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) { struct sock *sk = sock->sk; struct x25_sock *x25 = x25_sk(sk); void __user *argp = (void __user *)arg; int rc; switch (cmd) { |
fddc5f3e9 x25: Reduce switc... |
1327 1328 1329 1330 1331 1332 1333 1334 1335 |
case TIOCOUTQ: { int amount; amount = sk->sk_sndbuf - sk_wmem_alloc_get(sk); if (amount < 0) amount = 0; rc = put_user(amount, (unsigned int __user *)argp); break; } |
1da177e4c Linux-2.6.12-rc2 |
1336 |
|
fddc5f3e9 x25: Reduce switc... |
1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 |
case TIOCINQ: { struct sk_buff *skb; int amount = 0; /* * These two are safe on a single CPU system as * only user tasks fiddle here */ lock_sock(sk); if ((skb = skb_peek(&sk->sk_receive_queue)) != NULL) amount = skb->len; release_sock(sk); rc = put_user(amount, (unsigned int __user *)argp); break; } |
1da177e4c Linux-2.6.12-rc2 |
1351 |
|
fddc5f3e9 x25: Reduce switc... |
1352 1353 1354 1355 |
case SIOCGSTAMP: rc = -EINVAL; if (sk) rc = sock_get_timestamp(sk, |
f8e1d2018 [NET] X25: Fix wh... |
1356 |
(struct timeval __user *)argp); |
fddc5f3e9 x25: Reduce switc... |
1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 |
break; case SIOCGSTAMPNS: rc = -EINVAL; if (sk) rc = sock_get_timestampns(sk, (struct timespec __user *)argp); break; case SIOCGIFADDR: case SIOCSIFADDR: case SIOCGIFDSTADDR: case SIOCSIFDSTADDR: case SIOCGIFBRDADDR: case SIOCSIFBRDADDR: case SIOCGIFNETMASK: case SIOCSIFNETMASK: case SIOCGIFMETRIC: case SIOCSIFMETRIC: rc = -EINVAL; break; case SIOCADDRT: case SIOCDELRT: rc = -EPERM; if (!capable(CAP_NET_ADMIN)) |
1da177e4c Linux-2.6.12-rc2 |
1380 |
break; |
fddc5f3e9 x25: Reduce switc... |
1381 1382 1383 1384 1385 1386 1387 1388 |
rc = x25_route_ioctl(cmd, argp); break; case SIOCX25GSUBSCRIP: rc = x25_subscr_ioctl(cmd, argp); break; case SIOCX25SSUBSCRIP: rc = -EPERM; if (!capable(CAP_NET_ADMIN)) |
1da177e4c Linux-2.6.12-rc2 |
1389 |
break; |
fddc5f3e9 x25: Reduce switc... |
1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 |
rc = x25_subscr_ioctl(cmd, argp); break; case SIOCX25GFACILITIES: { lock_sock(sk); rc = copy_to_user(argp, &x25->facilities, sizeof(x25->facilities)) ? -EFAULT : 0; release_sock(sk); break; } |
1da177e4c Linux-2.6.12-rc2 |
1400 |
|
fddc5f3e9 x25: Reduce switc... |
1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 |
case SIOCX25SFACILITIES: { struct x25_facilities facilities; rc = -EFAULT; if (copy_from_user(&facilities, argp, sizeof(facilities))) break; rc = -EINVAL; lock_sock(sk); if (sk->sk_state != TCP_LISTEN && sk->sk_state != TCP_CLOSE) goto out_fac_release; if (facilities.pacsize_in < X25_PS16 || facilities.pacsize_in > X25_PS4096) goto out_fac_release; if (facilities.pacsize_out < X25_PS16 || facilities.pacsize_out > X25_PS4096) goto out_fac_release; if (facilities.winsize_in < 1 || facilities.winsize_in > 127) goto out_fac_release; if (facilities.throughput) { int out = facilities.throughput & 0xf0; int in = facilities.throughput & 0x0f; if (!out) facilities.throughput |= X25_DEFAULT_THROUGHPUT << 4; else if (out < 0x30 || out > 0xD0) |
f90de6606 X25 remove bkl in... |
1427 |
goto out_fac_release; |
fddc5f3e9 x25: Reduce switc... |
1428 1429 1430 1431 |
if (!in) facilities.throughput |= X25_DEFAULT_THROUGHPUT; else if (in < 0x03 || in > 0x0D) |
f90de6606 X25 remove bkl in... |
1432 |
goto out_fac_release; |
f8e1d2018 [NET] X25: Fix wh... |
1433 |
} |
fddc5f3e9 x25: Reduce switc... |
1434 1435 1436 1437 1438 1439 1440 1441 1442 |
if (facilities.reverse && (facilities.reverse & 0x81) != 0x81) goto out_fac_release; x25->facilities = facilities; rc = 0; out_fac_release: release_sock(sk); break; } |
a64b7b936 [X25]: allow ITU-... |
1443 |
|
fddc5f3e9 x25: Reduce switc... |
1444 1445 1446 1447 1448 1449 |
case SIOCX25GDTEFACILITIES: { lock_sock(sk); rc = copy_to_user(argp, &x25->dte_facilities, sizeof(x25->dte_facilities)); release_sock(sk); if (rc) |
f8e1d2018 [NET] X25: Fix wh... |
1450 |
rc = -EFAULT; |
fddc5f3e9 x25: Reduce switc... |
1451 1452 |
break; } |
a64b7b936 [X25]: allow ITU-... |
1453 |
|
fddc5f3e9 x25: Reduce switc... |
1454 1455 1456 1457 |
case SIOCX25SDTEFACILITIES: { struct x25_dte_facilities dtefacs; rc = -EFAULT; if (copy_from_user(&dtefacs, argp, sizeof(dtefacs))) |
1da177e4c Linux-2.6.12-rc2 |
1458 |
break; |
fddc5f3e9 x25: Reduce switc... |
1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 |
rc = -EINVAL; lock_sock(sk); if (sk->sk_state != TCP_LISTEN && sk->sk_state != TCP_CLOSE) goto out_dtefac_release; if (dtefacs.calling_len > X25_MAX_AE_LEN) goto out_dtefac_release; if (dtefacs.calling_ae == NULL) goto out_dtefac_release; if (dtefacs.called_len > X25_MAX_AE_LEN) goto out_dtefac_release; if (dtefacs.called_ae == NULL) goto out_dtefac_release; x25->dte_facilities = dtefacs; rc = 0; out_dtefac_release: release_sock(sk); break; } |
1da177e4c Linux-2.6.12-rc2 |
1478 |
|
fddc5f3e9 x25: Reduce switc... |
1479 1480 1481 1482 1483 1484 1485 1486 |
case SIOCX25GCALLUSERDATA: { lock_sock(sk); rc = copy_to_user(argp, &x25->calluserdata, sizeof(x25->calluserdata)) ? -EFAULT : 0; release_sock(sk); break; } |
1da177e4c Linux-2.6.12-rc2 |
1487 |
|
fddc5f3e9 x25: Reduce switc... |
1488 1489 |
case SIOCX25SCALLUSERDATA: { struct x25_calluserdata calluserdata; |
1da177e4c Linux-2.6.12-rc2 |
1490 |
|
fddc5f3e9 x25: Reduce switc... |
1491 1492 |
rc = -EFAULT; if (copy_from_user(&calluserdata, argp, sizeof(calluserdata))) |
1da177e4c Linux-2.6.12-rc2 |
1493 |
break; |
fddc5f3e9 x25: Reduce switc... |
1494 1495 1496 1497 1498 1499 1500 1501 1502 |
rc = -EINVAL; if (calluserdata.cudlength > X25_MAX_CUD_LEN) break; lock_sock(sk); x25->calluserdata = calluserdata; release_sock(sk); rc = 0; break; } |
1da177e4c Linux-2.6.12-rc2 |
1503 |
|
fddc5f3e9 x25: Reduce switc... |
1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 |
case SIOCX25GCAUSEDIAG: { lock_sock(sk); rc = copy_to_user(argp, &x25->causediag, sizeof(x25->causediag)) ? -EFAULT : 0; release_sock(sk); break; } case SIOCX25SCAUSEDIAG: { struct x25_causediag causediag; rc = -EFAULT; if (copy_from_user(&causediag, argp, sizeof(causediag))) |
386e50cc7 X25: Enable setti... |
1516 |
break; |
fddc5f3e9 x25: Reduce switc... |
1517 1518 1519 1520 1521 |
lock_sock(sk); x25->causediag = causediag; release_sock(sk); rc = 0; break; |
386e50cc7 X25: Enable setti... |
1522 |
|
fddc5f3e9 x25: Reduce switc... |
1523 |
} |
386e50cc7 X25: Enable setti... |
1524 |
|
fddc5f3e9 x25: Reduce switc... |
1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 |
case SIOCX25SCUDMATCHLEN: { struct x25_subaddr sub_addr; rc = -EINVAL; lock_sock(sk); if(sk->sk_state != TCP_CLOSE) goto out_cud_release; rc = -EFAULT; if (copy_from_user(&sub_addr, argp, sizeof(sub_addr))) goto out_cud_release; rc = -EINVAL; if (sub_addr.cudmatchlength > X25_MAX_CUD_LEN) goto out_cud_release; x25->cudmatchlength = sub_addr.cudmatchlength; rc = 0; |
3f0a069a1 X25 remove bkl in... |
1540 |
out_cud_release: |
fddc5f3e9 x25: Reduce switc... |
1541 1542 1543 |
release_sock(sk); break; } |
cb65d506c [X25]: Selective ... |
1544 |
|
fddc5f3e9 x25: Reduce switc... |
1545 1546 1547 1548 |
case SIOCX25CALLACCPTAPPRV: { rc = -EINVAL; lock_sock(sk); if (sk->sk_state != TCP_CLOSE) |
ebc3f64b8 [X25]: Fast selec... |
1549 |
break; |
fddc5f3e9 x25: Reduce switc... |
1550 1551 1552 1553 1554 |
clear_bit(X25_ACCPT_APPRV_FLAG, &x25->flags); release_sock(sk); rc = 0; break; } |
ebc3f64b8 [X25]: Fast selec... |
1555 |
|
fddc5f3e9 x25: Reduce switc... |
1556 1557 1558 1559 |
case SIOCX25SENDCALLACCPT: { rc = -EINVAL; lock_sock(sk); if (sk->sk_state != TCP_ESTABLISHED) |
ebc3f64b8 [X25]: Fast selec... |
1560 |
break; |
fddc5f3e9 x25: Reduce switc... |
1561 1562 |
/* must call accptapprv above */ if (test_bit(X25_ACCPT_APPRV_FLAG, &x25->flags)) |
1da177e4c Linux-2.6.12-rc2 |
1563 |
break; |
fddc5f3e9 x25: Reduce switc... |
1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 |
x25_write_internal(sk, X25_CALL_ACCEPTED); x25->state = X25_STATE_3; release_sock(sk); rc = 0; break; } default: rc = -ENOIOCTLCMD; break; |
1da177e4c Linux-2.6.12-rc2 |
1574 1575 1576 1577 |
} return rc; } |
ec1b4cf74 net: mark net_pro... |
1578 |
static const struct net_proto_family x25_family_ops = { |
1da177e4c Linux-2.6.12-rc2 |
1579 1580 1581 1582 |
.family = AF_X25, .create = x25_create, .owner = THIS_MODULE, }; |
1b06e6ba2 [X25]: ioctl conv... |
1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 |
#ifdef CONFIG_COMPAT static int compat_x25_subscr_ioctl(unsigned int cmd, struct compat_x25_subscrip_struct __user *x25_subscr32) { struct compat_x25_subscrip_struct x25_subscr; struct x25_neigh *nb; struct net_device *dev; int rc = -EINVAL; rc = -EFAULT; if (copy_from_user(&x25_subscr, x25_subscr32, sizeof(*x25_subscr32))) goto out; rc = -EINVAL; dev = x25_dev_get(x25_subscr.device); if (dev == NULL) goto out; nb = x25_get_neigh(dev); if (nb == NULL) goto out_dev_put; dev_put(dev); if (cmd == SIOCX25GSUBSCRIP) { |
5595a1a59 X25 remove bkl in... |
1608 |
read_lock_bh(&x25_neigh_list_lock); |
1b06e6ba2 [X25]: ioctl conv... |
1609 1610 |
x25_subscr.extended = nb->extended; x25_subscr.global_facil_mask = nb->global_facil_mask; |
5595a1a59 X25 remove bkl in... |
1611 |
read_unlock_bh(&x25_neigh_list_lock); |
1b06e6ba2 [X25]: ioctl conv... |
1612 1613 1614 1615 1616 1617 |
rc = copy_to_user(x25_subscr32, &x25_subscr, sizeof(*x25_subscr32)) ? -EFAULT : 0; } else { rc = -EINVAL; if (x25_subscr.extended == 0 || x25_subscr.extended == 1) { rc = 0; |
5595a1a59 X25 remove bkl in... |
1618 |
write_lock_bh(&x25_neigh_list_lock); |
1b06e6ba2 [X25]: ioctl conv... |
1619 1620 |
nb->extended = x25_subscr.extended; nb->global_facil_mask = x25_subscr.global_facil_mask; |
5595a1a59 X25 remove bkl in... |
1621 |
write_unlock_bh(&x25_neigh_list_lock); |
1b06e6ba2 [X25]: ioctl conv... |
1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 |
} } x25_neigh_put(nb); out: return rc; out_dev_put: dev_put(dev); goto out; } static int compat_x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) { void __user *argp = compat_ptr(arg); struct sock *sk = sock->sk; int rc = -ENOIOCTLCMD; switch(cmd) { case TIOCOUTQ: case TIOCINQ: rc = x25_ioctl(sock, cmd, (unsigned long)argp); break; case SIOCGSTAMP: rc = -EINVAL; if (sk) rc = compat_sock_get_timestamp(sk, (struct timeval __user*)argp); break; |
ae40eb1ef [NET]: Introduce ... |
1651 1652 1653 1654 1655 1656 |
case SIOCGSTAMPNS: rc = -EINVAL; if (sk) rc = compat_sock_get_timestampns(sk, (struct timespec __user*)argp); break; |
1b06e6ba2 [X25]: ioctl conv... |
1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 |
case SIOCGIFADDR: case SIOCSIFADDR: case SIOCGIFDSTADDR: case SIOCSIFDSTADDR: case SIOCGIFBRDADDR: case SIOCSIFBRDADDR: case SIOCGIFNETMASK: case SIOCSIFNETMASK: case SIOCGIFMETRIC: case SIOCSIFMETRIC: rc = -EINVAL; break; case SIOCADDRT: case SIOCDELRT: rc = -EPERM; if (!capable(CAP_NET_ADMIN)) break; rc = x25_route_ioctl(cmd, argp); break; case SIOCX25GSUBSCRIP: rc = compat_x25_subscr_ioctl(cmd, argp); break; case SIOCX25SSUBSCRIP: rc = -EPERM; if (!capable(CAP_NET_ADMIN)) break; rc = compat_x25_subscr_ioctl(cmd, argp); break; case SIOCX25GFACILITIES: case SIOCX25SFACILITIES: |
9a6b9f2e7 [X25]: dte facili... |
1687 1688 |
case SIOCX25GDTEFACILITIES: case SIOCX25SDTEFACILITIES: |
1b06e6ba2 [X25]: ioctl conv... |
1689 1690 1691 |
case SIOCX25GCALLUSERDATA: case SIOCX25SCALLUSERDATA: case SIOCX25GCAUSEDIAG: |
386e50cc7 X25: Enable setti... |
1692 |
case SIOCX25SCAUSEDIAG: |
1b06e6ba2 [X25]: ioctl conv... |
1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 |
case SIOCX25SCUDMATCHLEN: case SIOCX25CALLACCPTAPPRV: case SIOCX25SENDCALLACCPT: rc = x25_ioctl(sock, cmd, (unsigned long)argp); break; default: rc = -ENOIOCTLCMD; break; } return rc; } #endif |
91774904f net/x25: push BKL... |
1705 |
static const struct proto_ops x25_proto_ops = { |
1da177e4c Linux-2.6.12-rc2 |
1706 1707 1708 1709 1710 1711 1712 1713 |
.family = AF_X25, .owner = THIS_MODULE, .release = x25_release, .bind = x25_bind, .connect = x25_connect, .socketpair = sock_no_socketpair, .accept = x25_accept, .getname = x25_getname, |
768190fdc X.25 remove bkl i... |
1714 |
.poll = datagram_poll, |
1da177e4c Linux-2.6.12-rc2 |
1715 |
.ioctl = x25_ioctl, |
1b06e6ba2 [X25]: ioctl conv... |
1716 1717 1718 |
#ifdef CONFIG_COMPAT .compat_ioctl = compat_x25_ioctl, #endif |
1da177e4c Linux-2.6.12-rc2 |
1719 1720 1721 1722 1723 1724 1725 1726 1727 |
.listen = x25_listen, .shutdown = sock_no_shutdown, .setsockopt = x25_setsockopt, .getsockopt = x25_getsockopt, .sendmsg = x25_sendmsg, .recvmsg = x25_recvmsg, .mmap = sock_no_mmap, .sendpage = sock_no_sendpage, }; |
7546dd97d net: convert usag... |
1728 |
static struct packet_type x25_packet_type __read_mostly = { |
09640e636 net: replace uses... |
1729 |
.type = cpu_to_be16(ETH_P_X25), |
1da177e4c Linux-2.6.12-rc2 |
1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 |
.func = x25_lapb_receive_frame, }; static struct notifier_block x25_dev_notifier = { .notifier_call = x25_device_event, }; void x25_kill_by_neigh(struct x25_neigh *nb) { struct sock *s; struct hlist_node *node; write_lock_bh(&x25_list_lock); sk_for_each(s, node, &x25_list) if (x25_sk(s)->neighbour == nb) x25_disconnect(s, ENETUNREACH, 0, 0); write_unlock_bh(&x25_list_lock); |
95a9dc439 [X.25]: Add call ... |
1749 1750 1751 |
/* Remove any related forwards */ x25_clear_forward_by_dev(nb->dev); |
1da177e4c Linux-2.6.12-rc2 |
1752 1753 1754 1755 1756 1757 1758 1759 |
} static int __init x25_init(void) { int rc = proto_register(&x25_proto, 0); if (rc != 0) goto out; |
1fd975a05 X25: Check for er... |
1760 1761 1762 |
rc = sock_register(&x25_family_ops); if (rc != 0) goto out_proto; |
1da177e4c Linux-2.6.12-rc2 |
1763 1764 |
dev_add_pack(&x25_packet_type); |
1fd975a05 X25: Check for er... |
1765 1766 1767 |
rc = register_netdevice_notifier(&x25_dev_notifier); if (rc != 0) goto out_sock; |
1da177e4c Linux-2.6.12-rc2 |
1768 |
|
a44562e4d [AX25]: Beautify ... |
1769 1770 |
printk(KERN_INFO "X.25 for Linux Version 0.2 "); |
1da177e4c Linux-2.6.12-rc2 |
1771 |
|
1da177e4c Linux-2.6.12-rc2 |
1772 |
x25_register_sysctl(); |
1fd975a05 X25: Check for er... |
1773 1774 1775 |
rc = x25_proc_init(); if (rc != 0) goto out_dev; |
1da177e4c Linux-2.6.12-rc2 |
1776 1777 |
out: return rc; |
1fd975a05 X25: Check for er... |
1778 1779 1780 1781 1782 1783 1784 |
out_dev: unregister_netdevice_notifier(&x25_dev_notifier); out_sock: sock_unregister(AF_X25); out_proto: proto_unregister(&x25_proto); goto out; |
1da177e4c Linux-2.6.12-rc2 |
1785 1786 1787 1788 1789 1790 1791 1792 |
} module_init(x25_init); static void __exit x25_exit(void) { x25_proc_exit(); x25_link_free(); x25_route_free(); |
1da177e4c Linux-2.6.12-rc2 |
1793 |
x25_unregister_sysctl(); |
1da177e4c Linux-2.6.12-rc2 |
1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 |
unregister_netdevice_notifier(&x25_dev_notifier); dev_remove_pack(&x25_packet_type); sock_unregister(AF_X25); proto_unregister(&x25_proto); } module_exit(x25_exit); MODULE_AUTHOR("Jonathan Naylor <g4klx@g4klx.demon.co.uk>"); MODULE_DESCRIPTION("The X.25 Packet Layer network layer protocol"); MODULE_LICENSE("GPL"); MODULE_ALIAS_NETPROTO(PF_X25); |