← Back to branch summary

~ubuntu-branches/ubuntu/quantal/iproute/quantal

« back to all changes in this revision

Viewing changes to misc/ss.c

  • Committer: Package Import Robot
  • Author(s): Andreas Henriksson
  • Date: 2011-11-23 22:15:38 UTC
  • mfrom: (1.1.14) (23.1.7 sid)
  • Revision ID: package-import@ubuntu.com-20111123221538-vle47e8mp5375ruq
Tags: 20111117-1
* Imported Upstream version 3.1.0 (aka snapshot 20111117)
* Update download location in debian/copyright
  - tarballs now available from kernel.org
* Drop debian/patches/xt-v6.diff, fixed upstream.
* Refresh patches: debian/patches/moo.diff and txtdocs.diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
misc/ss.c
273
273
                        unsigned int ino;
274
274
                        char lnk[64];
275
275
                        int fd;
 
276
                        ssize_t link_len;
276
277
 
277
278
                        if (sscanf(d1->d_name, "%d%c", &fd, &crap) != 1)
278
279
                                continue;
279
280
 
280
281
                        sprintf(name+pos, "%d", fd);
281
 
                        if (readlink(name, lnk, sizeof(lnk)-1) < 0 ||
282
 
                            strncmp(lnk, pattern, strlen(pattern)))
 
282
 
 
283
                        link_len = readlink(name, lnk, sizeof(lnk)-1);
 
284
                        if (link_len == -1)
 
285
                                continue;
 
286
                        lnk[link_len] = '\0';
 
287
 
 
288
                        if (strncmp(lnk, pattern, strlen(pattern)))
283
289
                                continue;
284
290
 
285
291
                        sscanf(lnk, "socket:[%u]", &ino);
518
524
                                }
519
525
                        }
520
526
                }
 
527
                pclose(fp);
521
528
        }
522
529
}
523
530
 
2416
2423
"   -x, --unix          display only Unix domain sockets\n"
2417
2424
"   -f, --family=FAMILY display sockets of type FAMILY\n"
2418
2425
"\n"
2419
 
"   -A, --query=QUERY\n"
 
2426
"   -A, --query=QUERY, --socket=QUERY\n"
2420
2427
"       QUERY := {all|inet|tcp|udp|raw|unix|packet|netlink}[,QUERY]\n"
2421
2428
"\n"
 
2429
"   -D, --diag=FILE     Dump raw information about TCP sockets to FILE\n"
2422
2430
"   -F, --filter=FILE   read filter information from FILE\n"
2423
2431
"       FILTER := [ state TCP-STATE ] [ EXPRESSION ]\n"
2424
2432
                );
2486
2494
        { "packet", 0, 0, '0' },
2487
2495
        { "family", 1, 0, 'f' },
2488
2496
        { "socket", 1, 0, 'A' },
 
2497
        { "query", 1, 0, 'A' },
2489
2498
        { "summary", 0, 0, 's' },
2490
 
        { "diag", 0, 0, 'D' },
 
2499
        { "diag", 1, 0, 'D' },
2491
2500
        { "filter", 1, 0, 'F' },
2492
2501
        { "version", 0, 0, 'V' },
2493
2502
        { "help", 0, 0, 'h' },
2559
2568
                        current_filter.states = SS_ALL;
2560
2569
                        break;
2561
2570
                case 'l':
2562
 
                        current_filter.states = (1<<SS_LISTEN);
 
2571
                        current_filter.states = (1<<SS_LISTEN) | (1<<SS_CLOSE);
2563
2572
                        break;
2564
2573
                case '4':
2565
2574
                        preferred_family = AF_INET;