X-Git-Url: http://developer.intra2net.com/git/?p=libipt_ACCOUNT;a=blobdiff_plain;f=iptaccount%2Fiptaccount.c;h=1cd72e0e94748f4dc3941cc814f8682779ebba82;hp=7af5955e364bb624dc4376828635d65ff3136821;hb=1913c8942cab40bf20c6d792de7225954cc6f28f;hpb=bdcab4054e833c906e9e7ebde8288bc7acf426a9 diff --git a/iptaccount/iptaccount.c b/iptaccount/iptaccount.c index 7af5955..1cd72e0 100644 --- a/iptaccount/iptaccount.c +++ b/iptaccount/iptaccount.c @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by Intra2net AG * + * Copyright (C) 2004-2006 by Intra2net AG * * opensource@intra2net.com * * * * This program is free software; you can redistribute it and/or modify * @@ -25,7 +25,7 @@ static void sig_term(int signr) signal(SIGINT, SIG_IGN); signal(SIGQUIT, SIG_IGN); signal(SIGTERM, SIG_IGN); - + exit_now=1; } @@ -36,35 +36,34 @@ char *addr_to_dotted(unsigned int addr) bytep = (const unsigned char *) &addr; snprintf(buf, 16, "%u.%u.%u.%u", bytep[0], bytep[1], bytep[2], bytep[3]); + buf[16] = 0; return buf; } void show_usage(void) { - printf ("Unknown command line option. Try: [-u] [-h] [-a] [-f] [-l name]\n"); + printf ("Unknown command line option. Try: [-u] [-h] [-a] [-f] [-c] [-s] [-l name]\n"); printf("[-u] show kernel handle usage\n"); printf("[-h] free all kernel handles (experts only!)\n"); - printf("[-u] list all table names\n\n"); + printf("[-a] list all table names\n\n"); printf("[-l name] show table data\n"); printf("[-f] flush data after show\n"); printf("[-c] loop every second (abort with CTRL+C)\n"); + printf("[-s] CSV output (for spreadsheet import)\n"); printf("\n"); } int main(int argc, char *argv[]) { struct ipt_ACCOUNT_context ctx; - struct ipt_account_handle_ip *entry; + struct ipt_acc_handle_ip *entry; int i; - char optchar, doHandleUsage=0, doHandleFree=0, doListAll=0, doFlush=0, doContinue=0; + char optchar, doHandleUsage=0, doHandleFree=0, doTableNames=0, + doFlush=0, doContinue=0, doCSV=0; + char *table_name = NULL; - - // Show handle use count - // Free all handles - // List all tables - // do flush - // list TABLENAME - + const char *name; + printf("\nipt_ACCOUNT userspace accounting tool v%s\n\n", VERSION); if (argc == 1) @@ -73,7 +72,7 @@ int main(int argc, char *argv[]) exit(0); } - while ((optchar = getopt (argc, argv, "uhacfl:")) != -1) + while ((optchar = getopt (argc, argv, "uhacfsl:")) != -1) { switch (optchar) { @@ -84,7 +83,7 @@ int main(int argc, char *argv[]) doHandleFree=1; break; case 'a': - doListAll=1; + doTableNames=1; break; case 'f': doFlush=1; @@ -92,6 +91,9 @@ int main(int argc, char *argv[]) case 'c': doContinue=1; break; + case 's': + doCSV=1; + break; case 'l': table_name = (char *)strdup(optarg); break; @@ -102,7 +104,7 @@ int main(int argc, char *argv[]) break; } } - + // install exit handler if (signal(SIGTERM, sig_term) == SIG_ERR) { @@ -119,44 +121,95 @@ int main(int argc, char *argv[]) printf("can't install signal handler for SIGQUIT\n"); exit (-1); } - - + if(ipt_ACCOUNT_init(&ctx)) { printf("Init failed: %s\n", ctx.error_str); exit (-1); } - // Read out data - printf("Showing table: %s\n", table_name); - i = 0; - while (!exit_now) + // Get handle usage? + if (doHandleUsage) { - // Get entries from table test - if (ipt_ACCOUNT_read_entries(&ctx, table_name, !doFlush)) + int rtn = ipt_ACCOUNT_get_handle_usage(&ctx); + if (rtn < 0) { - printf("Read failed: %s\n", ctx.error_str); - ipt_ACCOUNT_deinit(&ctx); + printf("get_handle_usage failed: %s\n", ctx.error_str); exit (-1); } - - printf("Run #%d - %u %s found\n", i, ctx.handle.itemcount, ctx.handle.itemcount == 1 ? "item" : "items"); - - // Output and free entries - while ((entry = ipt_ACCOUNT_get_next_entry(&ctx)) != NULL) + + printf("Current kernel handle usage: %d\n", ctx.handle.itemcount); + } + + if (doHandleFree) + { + int rtn = ipt_ACCOUNT_free_all_handles(&ctx); + if (rtn < 0) { - printf("IP: %s SRC packets: %u bytes: %u DST packets: %u bytes: %u\n", - addr_to_dotted(entry->ip), entry->src_packets, entry->src_bytes, entry->dst_packets, entry->dst_bytes); + printf("handle_free_all failed: %s\n", ctx.error_str); + exit (-1); } - - if (doContinue) + + printf("Freed all handles in kernel space\n"); + } + + if (doTableNames) + { + int rtn = ipt_ACCOUNT_get_table_names(&ctx); + if (rtn < 0) { - sleep(1); - i++; - } else - exit_now = 1; + printf("get_table_names failed: %s\n", ctx.error_str); + exit (-1); + } + while ((name = ipt_ACCOUNT_get_next_name(&ctx)) != 0) + printf("Found table: %s\n", name); } - + + if (table_name) + { + // Read out data + if (doCSV) + printf("IP;SRC packets;SRC bytes;DST packets;DST bytes\n"); + else + printf("Showing table: %s\n", table_name); + + i = 0; + while (!exit_now) + { + // Get entries from table test + if (ipt_ACCOUNT_read_entries(&ctx, table_name, !doFlush)) + { + printf("Read failed: %s\n", ctx.error_str); + ipt_ACCOUNT_deinit(&ctx); + exit (-1); + } + + if (!doCSV) + printf("Run #%d - %u %s found\n", i, ctx.handle.itemcount, + ctx.handle.itemcount == 1 ? "item" : "items"); + + // Output and free entries + while ((entry = ipt_ACCOUNT_get_next_entry(&ctx)) != NULL) + { + if (doCSV) + printf("%s;%u;%u;%u;%u\n", + addr_to_dotted(entry->ip), entry->src_packets, entry->src_bytes, + entry->dst_packets, entry->dst_bytes); + else + printf("IP: %s SRC packets: %u bytes: %u DST packets: %u bytes: %u\n", + addr_to_dotted(entry->ip), entry->src_packets, entry->src_bytes, + entry->dst_packets, entry->dst_bytes); + } + + if (doContinue) + { + sleep(1); + i++; + } else + exit_now = 1; + } + } + printf("Finished.\n"); ipt_ACCOUNT_deinit(&ctx); exit (0);