From ae84d4a660a154bd0247584a5813e4a01b46bf4b Mon Sep 17 00:00:00 2001 From: sapanb Date: Wed, 13 Jan 2010 04:05:25 +0000 Subject: [PATCH] Change fprobe-ulog to use the new vserver.h file. git-svn-id: http://svn.planet-lab.org/svn/fprobe-ulog/trunk@16578 8c455092-636d-4788-adf5-e71def0336e8 --- src/fprobe-ulog.c | 4 ++-- src/vserver.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/fprobe-ulog.c b/src/fprobe-ulog.c index c744c01..c8b5c25 100644 --- a/src/fprobe-ulog.c +++ b/src/fprobe-ulog.c @@ -1159,8 +1159,8 @@ void *cap_thread() flow->xid=0; if (ulog_msg->mark > 0) { - flow->xid = get_vhi_name(ulog_msg->mark); - challenge = get_vhi_name(ulog_msg->mark); + /* flow->xid is really the slice id :-/ */ + flow->xid = xid_to_slice_id(ulog_msg->mark); } if (flow->xid < 1 || flow->xid!=challenge) diff --git a/src/vserver.h b/src/vserver.h index afeebf2..6037db3 100644 --- a/src/vserver.h +++ b/src/vserver.h @@ -53,6 +53,8 @@ uint32_t xid_to_slice_id_slow(unsigned int xid) { fscanf(fp,"%u",&slice_id); set_hash_entry(xid, slice_id); } + else + slice_id = xid; // Let's leave some evidence behind, even if it's imperfect. fclose(fp); return slice_id; } -- 2.43.0