@@ -117,7 +117,6 @@ func init() {
var (
myID protocol.DeviceID
stop = make(chan int)
- cert tls.Certificate
lans []*net.IPNet
)
@@ -304,10 +304,6 @@ func (info ConnectionInfo) MarshalJSON() ([]byte, error) {
// ConnectionStats returns a map with connection statistics for each device.
func (m *Model) ConnectionStats() map[string]interface{} {
- type remoteAddrer interface {
- RemoteAddr() net.Addr
- }
-
m.pmut.RLock()
m.fmut.RLock()
@@ -2,10 +2,7 @@
package protocol
-import (
- "io"
- "time"
-)
+import "time"
type TestModel struct {
data []byte
@@ -60,24 +57,3 @@ func (t *TestModel) closedError() error {
return nil // Timeout
}
-type ErrPipe struct {
- io.PipeWriter
- written int
- max int
- err error
- closed bool
-}
-func (e *ErrPipe) Write(data []byte) (int, error) {
- if e.closed {
- return 0, e.err
- if e.written+len(data) > e.max {
- n, _ := e.PipeWriter.Write(data[:e.max-e.written])
- e.PipeWriter.CloseWithError(e.err)
- e.closed = true
- return n, e.err
- return e.PipeWriter.Write(data)
@@ -566,16 +566,6 @@ func (c *rawConnection) handleResponse(msgID int, resp ResponseMessage) {
c.awaitingMut.Unlock()
-func (c *rawConnection) handlePong(msgID int) {
- c.awaitingMut.Lock()
- if rc := c.awaiting[msgID]; rc != nil {
- c.awaiting[msgID] = nil
- rc <- asyncResult{}
- close(rc)
- c.awaitingMut.Unlock()
func (c *rawConnection) send(msgID int, msgType int, msg encodable, done chan struct{}) bool {
if msgID < 0 {
select {
@@ -45,10 +45,6 @@ var testdata = testfileList{
{"further-excludes", 5, "7eb0a548094fa6295f7fd9200d69973e5f5ec5c04f2a86d998080ac43ecf89f1"},
-var correctIgnores = map[string][]string{
- ".": {".*", "quux"},
func init() {
// This test runs the risk of entering infinite recursion if it fails.
// Limit the stack size to 10 megs to crash early in that case instead of