Merged master to devel

.gitignore

@@ -6,3 +6,4 @@ flashlight_darwin_amd64
 flashlight_linux_386
 flashlight_linux_amd64
 flashlight_windows_386.exe
+flashlight.yaml

src/github.com/getlantern/flashlight/server/server.go

@@ -334,8 +334,12 @@ func unmapPort(port int) error {
 	return nil
 }
 
+// determineInternalIP determines the internal IP to use for mapping ports. It
+// does this by dialing a website on the public Internet and then finding out
+// the LocalAddr for the corresponding connection. This gives us an interface
+// that we know has Internet access, which makes it suitable for port mapping.
 func determineInternalIP() (string, error) {
-	conn, err := net.Dial("tcp", "s3.amazonaws.com:443")
+	conn, err := net.DialTimeout("tcp", "s3.amazonaws.com:443", 20*time.Second)
 	if err != nil {
 		return "", fmt.Errorf("Unable to determine local IP: %s", err)
 	}

src/github.com/getlantern/go-igdman/README.md

@@ -13,4 +13,25 @@ Acknowledgements:
 igdman is just a wrapper around:
 
 - [miniupnpc](https://github.com/miniupnp/miniupnp)
-- [go-nat-pmp](https://github.com/jackpal/go-nat-pmp/)
+- [go-nat-pmp](https://github.com/jackpal/go-nat-pmp/)
+
+## Embedding upnpc
+
+To build the go files that embed the upnpc executables for different platforms,
+just place the binaries into the right subfolder of `binaries` and then run
+`embedupnpc.bash`. This script takes care of code signing the ~~Windows and~~
+OS X executables.
+
+~~This script signs the Windows executable, which requires that
+[osslsigncode](http://sourceforge.net/projects/osslsigncode/) utility be
+installed. On OS X with homebrew, you can do this with
+`brew install osslsigncode`.~~
+
+~~You will also need to set the environment variables BNS_CERT and BNS_CERT_PASS
+to point to [bns-cert.p12](https://github.com/getlantern/too-many-secrets/blob/master/bns_cert.p12)
+and its [password](https://github.com/getlantern/too-many-secrets/blob/master/build-installers/env-vars.txt#L3)
+so that the script can sign the Windows executable.~~
+
+This script also signs the OS X executable, which requires you to use our OS X
+signing certificate, available [here](https://github.com/getlantern/too-many-secrets/blob/master/osx-code-signing-certificate.p12).
+The password is [here](https://github.com/getlantern/too-many-secrets/blob/master/osx-code-signing-certificate.p12.txt).

src/github.com/getlantern/go-igdman/embedupnpc.bash

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+###############################################################################
+#
+# This script regenerates the source files that embed the upnpc executable.
+#
+###############################################################################
+
+function die() {
+  echo $*
+  exit 1
+}
+
+# if [ -z "$BNS_CERT" ] || [ -z "$BNS_CERT_PASS" ]
+# then
+# 	die "$0: Please set BNS_CERT and BNS_CERT_PASS to the bns_cert.p12 signing key and the password for that key"
+# fi
+
+# osslsigncode sign -pkcs12 "$BNS_CERT" -pass "$BNS_CERT_PASS" -in binaries/windows/natty -out binaries/windows/natty || die "Could not sign windows"
+codesign -s "Developer ID Application: Brave New Software Project, Inc" -f binaries/osx/upnpc || die "Could not sign macintosh"
+
+go-bindata -nomemcopy -nocompress -pkg igdman -prefix binaries/osx -o igdman/upnpc_darwin.go binaries/osx
+# go-bindata -nomemcopy -nocompress -pkg bin -prefix binaries/linux_386 -o natty/bin/linux_386.go binaries/linux_386
+# go-bindata -nomemcopy -nocompress -pkg bin -prefix binaries/linux_amd64 -o natty/bin/linux_amd64.go binaries/linux_amd64
+# go-bindata -nomemcopy -nocompress -pkg bin -prefix binaries/windows -o natty/bin/windows.go binaries/windows

src/github.com/getlantern/go-igdman/igdman/igdman.go

@@ -22,8 +22,9 @@
 package igdman
 
 import (
-	"log"
 	"time"
+
+	"github.com/getlantern/golog"
 )
 
 // protocol is TCP or UDP
@@ -35,6 +36,8 @@ const (
 )
 
 var (
+	log = golog.LoggerFor("igdman")
+
 	opTimeout = 10 * time.Second
 )
 
@@ -55,7 +58,7 @@ type IGD interface {
 func NewIGD() (igd IGD, err error) {
 	igd, err = NewUpnpIGD()
 	if err != nil {
-		log.Printf("Unable to initialize UPnP IGD, falling back to NAT-PMP: %s", err)
+		log.Debugf("Unable to initialize UPnP IGD, falling back to NAT-PMP: %s", err)
 		igd, err = NewNATPMPIGD()
 	}
 	return

src/github.com/getlantern/go-igdman/igdman/upnp.go

@@ -67,7 +67,7 @@ func (igd *upnpIGD) AddPortMapping(proto protocol, internalIP string, internalPo
 	if expiration > 0 {
 		params = append(params, fmt.Sprintf("%d", expiration/time.Second))
 	}
-	out, err := upnpcbe.Command(params...).CombinedOutput()
+	out, err := execTimeout(opTimeout, upnpcbe.Command(params...))
 	if err != nil {
 		return fmt.Errorf("Unable to add port mapping: %s\n%s", err, out)
 	} else if strings.Contains(string(out), "failed with") {

src/github.com/getlantern/go-igdman/igdman/util_darwin.go

@@ -2,7 +2,6 @@ package igdman
 
 import (
 	"fmt"
-	"log"
 	"os/exec"
 	"regexp"
 	"time"
@@ -21,11 +20,13 @@ func init() {
 }
 
 func defaultGatewayIp() (string, error) {
+	log.Trace("Calling netstat")
 	cmd := exec.Command("netstat", "-f", "inet", "-rn")
 	out, err := execTimeout(10*time.Second, cmd)
 	if err != nil {
 		return "", fmt.Errorf("Unable to call netstat: %s\n%s", err, out)
 	}
+	log.Tracef("Netstat output\n------------\n%s\n\n", out)
 
 	submatches := searchRegex.FindSubmatch(out)
 	if len(submatches) < 2 {

src/github.com/getlantern/go-igdman/igdman/util_linux.go

@@ -2,7 +2,6 @@ package igdman
 
 import (
 	"fmt"
-	"log"
 	"os/exec"
 	"regexp"
 	"time"

src/github.com/getlantern/go-igdman/igdman/util_windows.go

@@ -2,7 +2,6 @@ package igdman
 
 import (
 	"fmt"
-	"log"
 	"os/exec"
 	"regexp"
 )