Add RemoteAddr support

Author: hodduc

datastream_client.go

@@ -38,7 +38,7 @@ type SpdyClientStream struct {
 	closed bool
 }
 
-func (stream *SpdyClientStream) OnInitialHeadersComplete(header http.Header) {
+func (stream *SpdyClientStream) OnInitialHeadersComplete(header http.Header, peerAddress string) {
 	stream.header = header
 	stream.headerParsed = true
 }

datastream_server.go

@@ -31,15 +31,17 @@ type SimpleServerStream struct {
 	closed           bool
 	streamId         uint32 // Just for logging purpose
 	header           http.Header
+	peerAddress      string
 	buffer           *bytes.Buffer
 	server           *QuicSpdyServer
 	quicServerStream *QuicServerStream
 	sessionFnChan    chan func()
 	closeNotifyChan  chan bool
 }
 
-func (stream *SimpleServerStream) OnInitialHeadersComplete(header http.Header) {
+func (stream *SimpleServerStream) OnInitialHeadersComplete(header http.Header, peerAddress string) {
 	stream.header = header
+	stream.peerAddress = peerAddress
 }
 
 func (stream *SimpleServerStream) OnTrailingHeadersComplete(header http.Header) {
@@ -68,7 +70,7 @@ func (stream *SimpleServerStream) ProcessRequest() {
 	req.Proto = header.Get(":version")
 	req.Header = header
 	req.Host = header.Get(":host")
-	// req.RemoteAddr = serverStream. TODO(serialx): Add remote addr
+	req.RemoteAddr = stream.peerAddress
 	rawPath := header.Get(":path")
 
 	url, err := url.ParseRequestURI(rawPath)

example/server.go

@@ -33,6 +33,8 @@ func httpHandler(w http.ResponseWriter, req *http.Request) {
 
 	w.Header().Set("AtEnd1", "value 1")
 	io.WriteString(w, "This HTTP response has both headers before this text and trailers at the end.\n")
+	io.WriteString(w, req.RemoteAddr)
+	io.WriteString(w, "\n")
 	w.Header().Set("AtEnd2", "value 2")
 	w.Header().Set("AtEnd3", "value 3") // These will appear as trailers.
 }

go_functions.c

@@ -67,8 +67,8 @@ void GoQuicSpdyClientStreamOnClose_C(int64_t go_quic_spdy_client_stream) {
     GoQuicSpdyClientStreamOnClose(go_quic_spdy_client_stream);
 }
 
-void GoQuicSimpleServerStreamOnInitialHeadersComplete_C(int64_t go_quic_simple_server_stream, struct GoSpdyHeader* headers) {
-    GoQuicSimpleServerStreamOnInitialHeadersComplete(go_quic_simple_server_stream, headers);
+void GoQuicSimpleServerStreamOnInitialHeadersComplete_C(int64_t go_quic_simple_server_stream, struct GoSpdyHeader* headers, const char *peer_address, uint32_t peer_address_len) {
+    GoQuicSimpleServerStreamOnInitialHeadersComplete(go_quic_simple_server_stream, headers, (void *)peer_address, peer_address_len);
 }
 void GoQuicSimpleServerStreamOnDataAvailable_C(int64_t go_quic_simple_server_stream, const char *data, uint32_t data_len, int is_closed) {
     GoQuicSimpleServerStreamOnDataAvailable(go_quic_simple_server_stream, (void *)data, data_len, is_closed);

go_functions.h

@@ -24,7 +24,7 @@ void GoQuicSpdyClientStreamOnInitialHeadersComplete_C(int64_t go_quic_spdy_clien
 void GoQuicSpdyClientStreamOnTrailingHeadersComplete_C(int64_t go_quic_spdy_client_stream, struct GoSpdyHeader* headers);
 void GoQuicSpdyClientStreamOnDataAvailable_C(int64_t go_quic_spdy_client_stream, const char *data, uint32_t data_len, int is_closed);
 void GoQuicSpdyClientStreamOnClose_C(int64_t go_quic_spdy_client_stream);
-void GoQuicSimpleServerStreamOnInitialHeadersComplete_C(int64_t go_quic_spdy_client_stream, struct GoSpdyHeader* headers);
+void GoQuicSimpleServerStreamOnInitialHeadersComplete_C(int64_t go_quic_spdy_client_stream, struct GoSpdyHeader* headers, const char *peer_address, uint32_t peer_address_len);
 void GoQuicSimpleServerStreamOnDataAvailable_C(int64_t go_quic_simple_server_stream, const char *data, uint32_t data_len, int is_closed);
 void GoQuicSimpleServerStreamOnClose_C(int64_t go_quic_simple_server_stream);
 

src/go_quic_simple_server_stream.cc

@@ -3,6 +3,7 @@
 #include "go_utils.h"
 
 #include "net/quic/quic_session.h"
+#include "net/quic/quic_spdy_session.h"
 #include "net/quic/spdy_utils.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_number_conversions.h"
@@ -32,8 +33,9 @@ void GoQuicSimpleServerStream::OnInitialHeadersComplete(bool fin,
     SendErrorResponse();
   }
 
+  auto peer_address = spdy_session()->connection()->peer_address().ToStringWithoutPort();
   auto hdr = CreateGoSpdyHeader(request_headers_);
-  GoQuicSimpleServerStreamOnInitialHeadersComplete_C(go_quic_simple_server_stream_, hdr);
+  GoQuicSimpleServerStreamOnInitialHeadersComplete_C(go_quic_simple_server_stream_, hdr, peer_address.data(), peer_address.length());
   DeleteGoSpdyHeader(hdr);
 
   MarkHeadersConsumed(decompressed_headers().length());
@@ -50,8 +52,9 @@ void GoQuicSimpleServerStream::OnInitialHeadersComplete(
     SendErrorResponse();
   }
 
+  auto peer_address = spdy_session()->connection()->peer_address().ToStringWithoutPort();
   auto hdr = CreateGoSpdyHeader(request_headers_);
-  GoQuicSimpleServerStreamOnInitialHeadersComplete_C(go_quic_simple_server_stream_, hdr);
+  GoQuicSimpleServerStreamOnInitialHeadersComplete_C(go_quic_simple_server_stream_, hdr, peer_address.data(), peer_address.length());
   DeleteGoSpdyHeader(hdr);
 
   ConsumeHeaderList();

stream.go

@@ -10,7 +10,7 @@ import (
 
 //   (~= QuicSpdy(Server|Client)Stream)
 type DataStreamProcessor interface {
-	OnInitialHeadersComplete(header http.Header)
+	OnInitialHeadersComplete(header http.Header, peerAddress string)
 	OnTrailingHeadersComplete(header http.Header)
 	OnDataAvailable(data []byte, isClosed bool)
 	OnClose()
@@ -83,10 +83,11 @@ func CreateIncomingDynamicStream(session_key int64, stream_id uint32, wrapper_c
 }
 
 //export GoQuicSimpleServerStreamOnInitialHeadersComplete
-func GoQuicSimpleServerStreamOnInitialHeadersComplete(quic_server_stream_key int64, headers_c *C.struct_GoSpdyHeader) {
+func GoQuicSimpleServerStreamOnInitialHeadersComplete(quic_server_stream_key int64, headers_c *C.struct_GoSpdyHeader, peer_addr unsafe.Pointer, peer_addr_len uint32) {
 	stream := quicServerStreamPtr.Get(quic_server_stream_key)
 	header := createHeader(headers_c)
-	stream.UserStream().OnInitialHeadersComplete(header)
+	peerAddr := C.GoStringN((*C.char)(peer_addr), (C.int)(peer_addr_len))
+	stream.UserStream().OnInitialHeadersComplete(header, peerAddr)
 }
 
 //export GoQuicSimpleServerStreamOnDataAvailable
@@ -106,7 +107,7 @@ func GoQuicSimpleServerStreamOnClose(quic_server_stream_key int64) {
 func GoQuicSpdyClientStreamOnInitialHeadersComplete(quic_client_stream_key int64, headers_c *C.struct_GoSpdyHeader) {
 	stream := quicClientStreamPtr.Get(quic_client_stream_key)
 	header := createHeader(headers_c)
-	stream.UserStream().OnInitialHeadersComplete(header)
+	stream.UserStream().OnInitialHeadersComplete(header, "")
 }
 
 //export GoQuicSpdyClientStreamOnTrailingHeadersComplete