summaryrefslogtreecommitdiff
path: root/nest/locks.h
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2015-02-21 11:39:45 +0100
committerOndrej Zajicek <santiago@crfreenet.org>2015-02-21 11:39:45 +0100
commit7730553b7eeb33d21e5597f110334ca584ad532d (patch)
treec80bf6d48fc91bafd7f0aefc859a033d3b472c89 /nest/locks.h
parent0da562a7cb25ed2b8724248ad6f841b1831a09c3 (diff)
parentec2194fa7a20a2768ca0027b5f3c024f0a251866 (diff)
Merge remote-tracking branch 'origin/soft-int'
Diffstat (limited to 'nest/locks.h')
-rw-r--r--nest/locks.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/nest/locks.h b/nest/locks.h
index 892d3c6b..3d58c8ed 100644
--- a/nest/locks.h
+++ b/nest/locks.h
@@ -26,9 +26,10 @@
struct object_lock {
resource r;
ip_addr addr; /* Identification of a object: IP address */
- unsigned int type; /* ... object type (OBJLOCK_xxx) */
+ uint type; /* ... object type (OBJLOCK_xxx) */
+ uint port; /* ... port number */
+ uint inst; /* ... instance ID */
struct iface *iface; /* ... interface */
- unsigned int port; /* ... port number */
void (*hook)(struct object_lock *); /* Called when the lock succeeds */
void *data; /* User data */
/* ... internal to lock manager, don't touch ... */