summaryrefslogtreecommitdiff
path: root/obfs4proxy
diff options
context:
space:
mode:
authorYawning Angel <yawning@torproject.org>2015-03-26 06:46:24 +0000
committerYawning Angel <yawning@torproject.org>2015-03-26 06:46:24 +0000
commitb670a079236a4e382cfe927f3e352b3e7a231166 (patch)
tree99e3a7d1a91e009d535345902d47b85176d78f9d /obfs4proxy
parent4e4c9052f436b86729b853715086e9445c76e185 (diff)
Fix comments. (No functional changes)
Diffstat (limited to 'obfs4proxy')
-rw-r--r--obfs4proxy/parentMonitor.go2
-rw-r--r--obfs4proxy/parentMonitor_linux.go7
2 files changed, 4 insertions, 5 deletions
diff --git a/obfs4proxy/parentMonitor.go b/obfs4proxy/parentMonitor.go
index beeea50..e2f078d 100644
--- a/obfs4proxy/parentMonitor.go
+++ b/obfs4proxy/parentMonitor.go
@@ -63,7 +63,7 @@ func parentMonitorPpidChange(ppid int) {
// exceptions (Slowlaris/Android), but the parent PID changes
// under those platforms as well.
//
- // Naturally we lose if the parent has died by the when the
+ // Naturally we lose if the parent has died by the time when the
// Getppid() call was issued in our parent, but, this is better
// than nothing.
diff --git a/obfs4proxy/parentMonitor_linux.go b/obfs4proxy/parentMonitor_linux.go
index 0fc967f..65fd307 100644
--- a/obfs4proxy/parentMonitor_linux.go
+++ b/obfs4proxy/parentMonitor_linux.go
@@ -33,10 +33,9 @@ import (
)
func parentMonitorInitLinux() error {
- /* Use prctl() to have the kernel deliver a SIGTERM if the parent
- * process dies. This beats anything else that can be done before
- * #15435 is implemented.
- */
+ // Use prctl() to have the kernel deliver a SIGTERM if the parent
+ // process dies. This beats anything else that can be done before
+ // #15435 is implemented.
_, _, errno := syscall.Syscall(syscall.SYS_PRCTL, syscall.PR_SET_PDEATHSIG, uintptr(syscall.SIGTERM), 0)
if errno != 0 {
var err error = errno