Merge pull request #157 from geebee/master

Add diagnostic output message for session ID

psiphon/controller.go

@@ -84,6 +84,7 @@ func NewController(config *Config) (controller *Controller, err error) {
 	if err != nil {
 		return nil, ContextError(err)
 	}
+	NoticeSessionId(sessionId)
 
 	// untunneledPendingConns may be used to interrupt the fetch remote server list
 	// request and other untunneled connection establishments. BindToDevice may be

psiphon/notice.go

@@ -214,6 +214,11 @@ func NoticeTunnels(count int) {
 	outputNotice("Tunnels", false, false, "count", count)
 }
 
+// NoticeSessionId is the session ID used across all tunnels established by the controller.
+func NoticeSessionId(sessionId string) {
+	outputNotice("SessionId", true, false, "sessionId", sessionId)
+}
+
 func NoticeImpairedProtocolClassification(impairedProtocolClassification map[string]int) {
 	outputNotice("ImpairedProtocolClassification", false, false,
 		"classification", impairedProtocolClassification)