X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Ffprobe-ulog.c;h=3edf32af5af67719c880c5767a382b466354a29c;hb=6da4b31660254b81a2506756b1ca9e93e9411222;hp=99b39bb8d59dbc0a877376ac2e453fc900568662;hpb=97d340fa7fecb9236838f7d2494c33dc6e64e3a2;p=fprobe-ulog.git diff --git a/src/fprobe-ulog.c b/src/fprobe-ulog.c index 99b39bb..3edf32a 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 @@ -106,6 +111,7 @@ enum { Uflag, uflag, vflag, + Wflag, Xflag, }; @@ -252,7 +258,9 @@ void usage() "-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", + "-W \tSet current epoch to n. Useful when restarting fprobe\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 +303,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 +321,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)); @@ -349,25 +370,39 @@ inline void copy_flow(struct Flow *src, struct Flow *dst) dst->flags = src->flags; } +void update_cur_epoch_file(int n) { + int fd, len; + char snum[7]; + len=snprintf(snum,6,"%d",n); + fd = open("/tmp/fprobe_last_epoch",O_WRONLY|O_CREAT); + if (fd == -1) { + my_log(LOG_ERR, "open() failed: /tmp/fprobe_last_epoch"); + return; + } + write(fd, snum, len); + close(fd); +} + unsigned get_log_fd(char *fname, unsigned cur_fd) { struct Time now; unsigned cur_uptime; int ret_fd; gettime(&now); - cur_uptime = getuptime(&now); + cur_uptime = getuptime_minutes(&now); - /* Epoch lenght in minutes */ - if ((cur_uptime - prev_uptime) > (1000 * 60 * epoch_length)) { + /* 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; cur_epoch = (cur_epoch + 1) % log_epochs; close(cur_fd); snprintf(nextname,MAX_PATH_LEN,"%s.%d",fname,cur_epoch); - if ((write_fd = open(nextname, O_WRONLY|O_CREAT)) < 0) { - fprintf(stderr, "open(): %s (%s)\n", nextname, strerror(errno)); + if ((write_fd = open(nextname, O_WRONLY|O_CREAT|O_TRUNC)) < 0) { + my_log(LOG_ERR, "open(): %s (%s)\n", nextname, strerror(errno)); exit(1); } + update_cur_epoch_file(cur_epoch); ret_fd = write_fd; } else @@ -475,7 +510,7 @@ int put_into(struct Flow *flow, int flag ?FIXME? Several packets with FLOW_TL (attack) */ - flown->sp = flow->sp; + flown->sp = flow->sp; flown->dp = flow->dp; } if (flow->flags & FLOW_LASTFRAG) { @@ -530,6 +565,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; @@ -629,9 +667,9 @@ void *fill(int fields, uint16_t *format, struct Flow *flow, void *p) *((uint8_t *) p) = 0; p += NETFLOW_PAD8_SIZE; break; - case NETFLOW_PLANETLAB_XID: + case NETFLOW_XID: *((uint16_t *) p) = flow->tos; - p += NETFLOW_PLANETLAB_XID_SIZE; + p += NETFLOW_XID_SIZE; break; case NETFLOW_PAD16: /* Unsupported (uint16_t) */ @@ -727,13 +765,13 @@ void *emit_thread() 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); - ret = write(peers[0].write_fd, emit_packet, size); + peers[i].write_fd = get_log_fd(peers[i].fname, peers[i].write_fd); + ret = write(peers[i].write_fd, emit_packet, size); if (ret < size) { + #if ((DEBUG) & DEBUG_E) || defined MESSAGES my_log(LOG_ERR, "write(to #%d, seq %d, flows %d, size %d) == %d: %s", i + 1, peers[i].seq, emit_count, size, ret, strerror(errno)); @@ -746,7 +784,7 @@ void *emit_thread() emit_count, i + 1, peers[i].seq); } #endif - peers[0].seq += emit_count; + peers[i].seq += emit_count; /* Rate limit */ if (emit_rate_bytes) { @@ -1015,6 +1053,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; @@ -1189,6 +1230,7 @@ int main(int argc, char **argv) } if (parms[Uflag].count) ulog_gmask = atoi(parms[Uflag].arg); + if (parms[Wflag].count) cur_epoch = atoi(parms[Wflag].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); @@ -1371,12 +1413,12 @@ bad_collector: else if (parms[fflag].count) { // log into a file if (!(peers = malloc(npeers * sizeof(struct peer)))) goto err_malloc; - if (!(peers[0].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