o Fix locking.

chris · chris · commit 571651d117e2 · 2012-07-11T22:06:52.000Z
diff --git a/lispd_tuntap/lispd.c b/lispd_tuntap/lispd.c
@@ -203,7 +203,7 @@ int get_process_lock(int pid)
     fl.l_start = 0;
     fl.l_len = 1;
 
-    if ((fdlock = open(LISPD_LOCKFILE, O_WRONLY|O_CREAT|O_EXCL, 0666)) == -1) {
+    if ((fdlock = open(LISPD_LOCKFILE, O_RDWR|O_CREAT, 0666)) == -1) {
         return FALSE;
     }
 
diff --git a/lispd_tuntap/lispd_tuntap.c b/lispd_tuntap/lispd_tuntap.c
@@ -141,7 +141,6 @@ void tuntap_process_output_packet(void)
 
     nread = read(tun_receive_fd, tun_receive_buf, TunReceiveSize);
 
-    log_msg(INFO, "Output packet first byte: 0x%x", tun_receive_buf[0]);
     ipversion = (tun_receive_buf[0] & 0xf0) >> 4;
     switch (ipversion) {
 

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ int get_process_lock(int pid)`
`203`	`203`	`fl.l_start = 0;`
`204`	`204`	`fl.l_len = 1;`
`205`	`205`
`206`		`- if ((fdlock = open(LISPD_LOCKFILE, O_WRONLY\|O_CREAT\|O_EXCL, 0666)) == -1) {`
	`206`	`+ if ((fdlock = open(LISPD_LOCKFILE, O_RDWR\|O_CREAT, 0666)) == -1) {`
`207`	`207`	`return FALSE;`
`208`	`208`	`}`
`209`	`209`