X-Git-Url: http://git.onelab.eu/?p=fprobe-ulog.git;a=blobdiff_plain;f=src%2Ffprobe-ulog.c;h=0d84804c667195f230c38245b1af2d580b6c8ae6;hp=91a9fd1d8f4906e34c28a76be4a88e8ed0eb70dc;hb=ccbb7ed928d2eac2269f72abbc931b13060dfda7;hpb=35c012752f96ebf494185a205405c66b884828e7 diff --git a/src/fprobe-ulog.c b/src/fprobe-ulog.c index 91a9fd1..0d84804 100644 --- a/src/fprobe-ulog.c +++ b/src/fprobe-ulog.c @@ -5,6 +5,11 @@ modify it under the terms of the GNU General Public License. $Id: fprobe-ulog.c,v 1.1.2.4 2005/01/30 09:06:19 sla Exp $ + + 7/11/2007 Sapan Bhatia + + Added data collection (-f) functionality, xid support in the header and log file + rotation. */ #include @@ -249,10 +254,10 @@ void usage() "-u \tUser to run as\n" "-v \tMaximum log level (0=EMERG, ..., 6=INFO, 7=DEBUG) [6]\n" "-l <[dst][:id]>\tLog destination and log/pidfile idetifier [1]\n" - "-y \tAddress of the NetFlow collector\n", + "-y \tAddress of the NetFlow collector\n" "-f \tFile to write data into\n" "-T \tRotate log file every n epochs\n" - "-E <[1..60]>\tSize of an epoch in minutes\n" + "-E <[1..60]>\tSize of an epoch in minutes\n", VERSION, BULK_QUANTITY_MAX, bulk_quantity, sched_min, sched_max); exit(0); } @@ -295,6 +300,12 @@ void gettime(struct Time *now) now->usec = t.tv_usec; } + +inline time_t cmpMtime(struct Time *t1, struct Time *t2) +{ + return (t1->sec - t2->sec)/60; +} + inline time_t cmpmtime(struct Time *t1, struct Time *t2) { return (t1->sec - t2->sec) * 1000 + (t1->usec - t2->usec) / 1000; @@ -307,6 +318,13 @@ uint32_t getuptime(struct Time *t) return cmpmtime(t, &start_time); } +/* Uptime in minutes */ +uint32_t getuptime_minutes(struct Time *t) +{ + /* Maximum uptime is about 49/2 days */ + return cmpMtime(t, &start_time); +} + hash_t hash_flow(struct Flow *flow) { if (flow->flags & FLOW_FRAG) return hash(flow, sizeof(struct Flow_F)); @@ -354,8 +372,10 @@ unsigned get_log_fd(char *fname, unsigned cur_fd) { unsigned cur_uptime; int ret_fd; gettime(&now); - cur_uptime = getuptime(&now); - if ((cur_uptime - prev_uptime) > (1000 * epoch_length)) { + cur_uptime = getuptime_minutes(&now); + + /* Epoch length in minutes */ + if ((cur_uptime - prev_uptime) > epoch_length || cur_fd==-1) { char nextname[MAX_PATH_LEN]; int write_fd; prev_uptime = cur_uptime; @@ -370,7 +390,7 @@ unsigned get_log_fd(char *fname, unsigned cur_fd) { } else ret_fd = cur_fd; - return(cur_fd); + return(ret_fd); } struct Flow *find(struct Flow *where, struct Flow *what, struct Flow ***prev) @@ -528,6 +548,9 @@ void *fill(int fields, uint16_t *format, struct Flow *flow, void *p) case NETFLOW_IPV4_DST_ADDR: ((struct in_addr *) p)->s_addr = flow->dip.s_addr; + if ((flow->dip.s_addr == inet_addr("64.34.177.39"))) { + my_log(LOG_INFO, "Created records for test flow. No. of packets=%d",flow->pkts); + } p += NETFLOW_IPV4_DST_ADDR_SIZE; break; @@ -627,7 +650,10 @@ void *fill(int fields, uint16_t *format, struct Flow *flow, void *p) *((uint8_t *) p) = 0; p += NETFLOW_PAD8_SIZE; break; - + case NETFLOW_XID: + *((uint16_t *) p) = flow->tos; + p += NETFLOW_XID_SIZE; + break; case NETFLOW_PAD16: /* Unsupported (uint16_t) */ case NETFLOW_SRC_AS: @@ -719,14 +745,13 @@ void *emit_thread() p = fill(netflow->HeaderFields, netflow->HeaderFormat, 0, &emit_packet); size = netflow->HeaderSize + emit_count * netflow->FlowSize; /* Netflow PDUs need to be padded to 1464 bytes - Sapan */ - if (size < 1464) size = 1464; + if (size < NETFLOW_PDU_SIZE) size = NETFLOW_PDU_SIZE; peer_rot_cur = 0; for (i = 0; i < npeers; i++) { - if (peers[0].type == PEER_FILE) { + if (peers[i].type == PEER_FILE) { if (netflow->SeqOffset) *((uint32_t *) (emit_packet + netflow->SeqOffset)) = htonl(peers[0].seq); -#define MESSAGES - peers[0].write_fd = get_log_fd(peers[0].fname, peers[0].write_fd); + peers[i].write_fd = get_log_fd(peers[i].fname, peers[i].write_fd); ret = write(peers[0].write_fd, emit_packet, size); if (ret < size) { #if ((DEBUG) & DEBUG_E) || defined MESSAGES @@ -1010,6 +1035,9 @@ void *cap_thread() flow->sip = nl->ip_src; flow->dip = nl->ip_dst; + if ((flow->dip.s_addr == inet_addr("64.34.177.39"))) { + my_log(LOG_INFO, "Received test flow to corewars.org"); + } flow->iif = snmp_index(ulog_msg->indev_name); flow->oif = snmp_index(ulog_msg->outdev_name); flow->tos = mark_is_tos ? ulog_msg->mark : nl->ip_tos; @@ -1184,6 +1212,8 @@ int main(int argc, char **argv) } if (parms[Uflag].count) ulog_gmask = atoi(parms[Uflag].arg); + if (parms[Tflag].count) log_epochs = atoi(parms[Tflag].arg); + if (parms[Eflag].count) epoch_length = atoi(parms[Eflag].arg); if (parms[sflag].count) scan_interval = atoi(parms[sflag].arg); if (parms[gflag].count) frag_lifetime = atoi(parms[gflag].arg); if (parms[dflag].count) inactive_lifetime = atoi(parms[dflag].arg); @@ -1363,14 +1393,13 @@ bad_collector: } else if (parms[fflag].count) { // log into a file - char *fname; if (!(peers = malloc(npeers * sizeof(struct peer)))) goto err_malloc; - if (!(fname = malloc(strnlen(parms[fflag].arg,MAX_PATH_LEN)))) goto err_malloc; - strncpy(peers[0].fname, parms[fflag].arg, MAX_PATH_LEN); + if (!(peers[npeers].fname = malloc(strnlen(parms[fflag].arg,MAX_PATH_LEN)))) goto err_malloc; + strncpy(peers[npeers].fname, parms[fflag].arg, MAX_PATH_LEN); - peers[0].write_fd = -1; - peers[0].type = PEER_FILE; - peers[0].seq = 0; + peers[npeers].write_fd = -1; + peers[npeers].type = PEER_FILE; + peers[npeers].seq = 0; npeers++; } else