forked from cwtch.im/cwtch
Merge branch 'libricochet' of dan/cwtch into master
This commit is contained in:
commit
1ea1521fee
|
@ -6,7 +6,7 @@ import (
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/golang/protobuf/proto"
|
"github.com/golang/protobuf/proto"
|
||||||
"github.com/s-rah/go-ricochet/utils"
|
"git.openprivacy.ca/openprivacy/libricochet-go/utils"
|
||||||
"golang.org/x/crypto/nacl/secretbox"
|
"golang.org/x/crypto/nacl/secretbox"
|
||||||
"io"
|
"io"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
|
@ -7,7 +7,7 @@ import (
|
||||||
"encoding/asn1"
|
"encoding/asn1"
|
||||||
"errors"
|
"errors"
|
||||||
"github.com/golang/protobuf/proto"
|
"github.com/golang/protobuf/proto"
|
||||||
"github.com/s-rah/go-ricochet/utils"
|
"git.openprivacy.ca/openprivacy/libricochet-go/utils"
|
||||||
"golang.org/x/crypto/ed25519"
|
"golang.org/x/crypto/ed25519"
|
||||||
"io"
|
"io"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
|
@ -3,11 +3,10 @@ package connections
|
||||||
import (
|
import (
|
||||||
"cwtch.im/cwtch/peer/peer"
|
"cwtch.im/cwtch/peer/peer"
|
||||||
"cwtch.im/cwtch/protocol"
|
"cwtch.im/cwtch/protocol"
|
||||||
"github.com/s-rah/go-ricochet"
|
"git.openprivacy.ca/openprivacy/libricochet-go"
|
||||||
"github.com/s-rah/go-ricochet/channels"
|
"git.openprivacy.ca/openprivacy/libricochet-go/channels"
|
||||||
"github.com/s-rah/go-ricochet/connection"
|
"git.openprivacy.ca/openprivacy/libricochet-go/connection"
|
||||||
"github.com/s-rah/go-ricochet/identity"
|
"git.openprivacy.ca/openprivacy/libricochet-go/identity"
|
||||||
//"github.com/s-rah/go-ricochet/utils"
|
|
||||||
"cwtch.im/cwtch/model"
|
"cwtch.im/cwtch/model"
|
||||||
"log"
|
"log"
|
||||||
"time"
|
"time"
|
||||||
|
|
|
@ -5,11 +5,11 @@ import (
|
||||||
"cwtch.im/cwtch/model"
|
"cwtch.im/cwtch/model"
|
||||||
"cwtch.im/cwtch/peer/peer"
|
"cwtch.im/cwtch/peer/peer"
|
||||||
"cwtch.im/cwtch/protocol"
|
"cwtch.im/cwtch/protocol"
|
||||||
"github.com/s-rah/go-ricochet"
|
"git.openprivacy.ca/openprivacy/libricochet-go"
|
||||||
"github.com/s-rah/go-ricochet/channels"
|
"git.openprivacy.ca/openprivacy/libricochet-go/channels"
|
||||||
"github.com/s-rah/go-ricochet/connection"
|
"git.openprivacy.ca/openprivacy/libricochet-go/connection"
|
||||||
"github.com/s-rah/go-ricochet/identity"
|
"git.openprivacy.ca/openprivacy/libricochet-go/identity"
|
||||||
"github.com/s-rah/go-ricochet/utils"
|
"git.openprivacy.ca/openprivacy/libricochet-go/utils"
|
||||||
"net"
|
"net"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
|
@ -6,11 +6,11 @@ import (
|
||||||
"cwtch.im/cwtch/peer/send"
|
"cwtch.im/cwtch/peer/send"
|
||||||
"cwtch.im/cwtch/protocol"
|
"cwtch.im/cwtch/protocol"
|
||||||
"errors"
|
"errors"
|
||||||
"github.com/s-rah/go-ricochet"
|
"git.openprivacy.ca/openprivacy/libricochet-go"
|
||||||
"github.com/s-rah/go-ricochet/channels"
|
"git.openprivacy.ca/openprivacy/libricochet-go/channels"
|
||||||
"github.com/s-rah/go-ricochet/connection"
|
"git.openprivacy.ca/openprivacy/libricochet-go/connection"
|
||||||
"github.com/s-rah/go-ricochet/identity"
|
"git.openprivacy.ca/openprivacy/libricochet-go/identity"
|
||||||
"github.com/s-rah/go-ricochet/utils"
|
"git.openprivacy.ca/openprivacy/libricochet-go/utils"
|
||||||
"log"
|
"log"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
|
@ -5,11 +5,11 @@ import (
|
||||||
"cwtch.im/cwtch/protocol"
|
"cwtch.im/cwtch/protocol"
|
||||||
"cwtch.im/cwtch/server/fetch"
|
"cwtch.im/cwtch/server/fetch"
|
||||||
"cwtch.im/cwtch/server/send"
|
"cwtch.im/cwtch/server/send"
|
||||||
"github.com/s-rah/go-ricochet"
|
"git.openprivacy.ca/openprivacy/libricochet-go"
|
||||||
"github.com/s-rah/go-ricochet/channels"
|
"git.openprivacy.ca/openprivacy/libricochet-go/channels"
|
||||||
"github.com/s-rah/go-ricochet/connection"
|
"git.openprivacy.ca/openprivacy/libricochet-go/connection"
|
||||||
"github.com/s-rah/go-ricochet/identity"
|
"git.openprivacy.ca/openprivacy/libricochet-go/identity"
|
||||||
"github.com/s-rah/go-ricochet/utils"
|
"git.openprivacy.ca/openprivacy/libricochet-go/utils"
|
||||||
"net"
|
"net"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
|
@ -10,9 +10,9 @@ import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
"github.com/golang/protobuf/proto"
|
"github.com/golang/protobuf/proto"
|
||||||
"github.com/s-rah/go-ricochet/application"
|
"git.openprivacy.ca/openprivacy/libricochet-go/application"
|
||||||
"github.com/s-rah/go-ricochet/channels"
|
"git.openprivacy.ca/openprivacy/libricochet-go/channels"
|
||||||
"github.com/s-rah/go-ricochet/connection"
|
"git.openprivacy.ca/openprivacy/libricochet-go/connection"
|
||||||
"golang.org/x/crypto/ed25519"
|
"golang.org/x/crypto/ed25519"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"log"
|
"log"
|
||||||
|
|
|
@ -4,9 +4,9 @@ import (
|
||||||
"cwtch.im/cwtch/protocol"
|
"cwtch.im/cwtch/protocol"
|
||||||
"errors"
|
"errors"
|
||||||
"github.com/golang/protobuf/proto"
|
"github.com/golang/protobuf/proto"
|
||||||
"github.com/s-rah/go-ricochet/channels"
|
"git.openprivacy.ca/openprivacy/libricochet-go/channels"
|
||||||
"github.com/s-rah/go-ricochet/utils"
|
"git.openprivacy.ca/openprivacy/libricochet-go/utils"
|
||||||
"github.com/s-rah/go-ricochet/wire/control"
|
"git.openprivacy.ca/openprivacy/libricochet-go/wire/control"
|
||||||
)
|
)
|
||||||
|
|
||||||
// CwtchPeerFetchChannel is the peer implementation of the im.cwtch.server.fetch
|
// CwtchPeerFetchChannel is the peer implementation of the im.cwtch.server.fetch
|
||||||
|
|
|
@ -3,8 +3,8 @@ package fetch
|
||||||
import (
|
import (
|
||||||
"cwtch.im/cwtch/protocol"
|
"cwtch.im/cwtch/protocol"
|
||||||
"github.com/golang/protobuf/proto"
|
"github.com/golang/protobuf/proto"
|
||||||
"github.com/s-rah/go-ricochet/channels"
|
"git.openprivacy.ca/openprivacy/libricochet-go/channels"
|
||||||
"github.com/s-rah/go-ricochet/wire/control"
|
"git.openprivacy.ca/openprivacy/libricochet-go/wire/control"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
|
@ -4,9 +4,9 @@ import (
|
||||||
"cwtch.im/cwtch/protocol"
|
"cwtch.im/cwtch/protocol"
|
||||||
"errors"
|
"errors"
|
||||||
"github.com/golang/protobuf/proto"
|
"github.com/golang/protobuf/proto"
|
||||||
"github.com/s-rah/go-ricochet/channels"
|
"git.openprivacy.ca/openprivacy/libricochet-go/channels"
|
||||||
"github.com/s-rah/go-ricochet/utils"
|
"git.openprivacy.ca/openprivacy/libricochet-go/utils"
|
||||||
"github.com/s-rah/go-ricochet/wire/control"
|
"git.openprivacy.ca/openprivacy/libricochet-go/wire/control"
|
||||||
)
|
)
|
||||||
|
|
||||||
// CwtchPeerListenChannel is the peer implementation of im.cwtch.server.listen
|
// CwtchPeerListenChannel is the peer implementation of im.cwtch.server.listen
|
||||||
|
|
|
@ -3,8 +3,8 @@ package listen
|
||||||
import (
|
import (
|
||||||
"cwtch.im/cwtch/protocol"
|
"cwtch.im/cwtch/protocol"
|
||||||
"github.com/golang/protobuf/proto"
|
"github.com/golang/protobuf/proto"
|
||||||
"github.com/s-rah/go-ricochet/channels"
|
"git.openprivacy.ca/openprivacy/libricochet-go/channels"
|
||||||
"github.com/s-rah/go-ricochet/wire/control"
|
"git.openprivacy.ca/openprivacy/libricochet-go/wire/control"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
|
@ -3,9 +3,9 @@ package peer
|
||||||
import (
|
import (
|
||||||
"cwtch.im/cwtch/protocol"
|
"cwtch.im/cwtch/protocol"
|
||||||
"github.com/golang/protobuf/proto"
|
"github.com/golang/protobuf/proto"
|
||||||
"github.com/s-rah/go-ricochet/channels"
|
"git.openprivacy.ca/openprivacy/libricochet-go/channels"
|
||||||
"github.com/s-rah/go-ricochet/utils"
|
"git.openprivacy.ca/openprivacy/libricochet-go/utils"
|
||||||
"github.com/s-rah/go-ricochet/wire/control"
|
"git.openprivacy.ca/openprivacy/libricochet-go/wire/control"
|
||||||
"log"
|
"log"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -3,8 +3,8 @@ package peer
|
||||||
import (
|
import (
|
||||||
"cwtch.im/cwtch/protocol"
|
"cwtch.im/cwtch/protocol"
|
||||||
"github.com/golang/protobuf/proto"
|
"github.com/golang/protobuf/proto"
|
||||||
"github.com/s-rah/go-ricochet/channels"
|
"git.openprivacy.ca/openprivacy/libricochet-go/channels"
|
||||||
"github.com/s-rah/go-ricochet/wire/control"
|
"git.openprivacy.ca/openprivacy/libricochet-go/wire/control"
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -5,9 +5,9 @@ import (
|
||||||
"cwtch.im/cwtch/protocol/spam"
|
"cwtch.im/cwtch/protocol/spam"
|
||||||
"errors"
|
"errors"
|
||||||
"github.com/golang/protobuf/proto"
|
"github.com/golang/protobuf/proto"
|
||||||
"github.com/s-rah/go-ricochet/channels"
|
"git.openprivacy.ca/openprivacy/libricochet-go/channels"
|
||||||
"github.com/s-rah/go-ricochet/utils"
|
"git.openprivacy.ca/openprivacy/libricochet-go/utils"
|
||||||
"github.com/s-rah/go-ricochet/wire/control"
|
"git.openprivacy.ca/openprivacy/libricochet-go/wire/control"
|
||||||
)
|
)
|
||||||
|
|
||||||
// CwtchPeerSendChannel is the peer implementation of im.cwtch.server.send
|
// CwtchPeerSendChannel is the peer implementation of im.cwtch.server.send
|
||||||
|
|
|
@ -4,8 +4,8 @@ import (
|
||||||
"cwtch.im/cwtch/protocol"
|
"cwtch.im/cwtch/protocol"
|
||||||
"cwtch.im/cwtch/protocol/spam"
|
"cwtch.im/cwtch/protocol/spam"
|
||||||
"github.com/golang/protobuf/proto"
|
"github.com/golang/protobuf/proto"
|
||||||
"github.com/s-rah/go-ricochet/channels"
|
"git.openprivacy.ca/openprivacy/libricochet-go/channels"
|
||||||
"github.com/s-rah/go-ricochet/wire/control"
|
"git.openprivacy.ca/openprivacy/libricochet-go/wire/control"
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ package protocol
|
||||||
import proto "github.com/golang/protobuf/proto"
|
import proto "github.com/golang/protobuf/proto"
|
||||||
import fmt "fmt"
|
import fmt "fmt"
|
||||||
import math "math"
|
import math "math"
|
||||||
import control "github.com/s-rah/go-ricochet/wire/control"
|
import control "git.openprivacy.ca/openprivacy/libricochet-go/wire/control"
|
||||||
|
|
||||||
// Reference imports to suppress errors if they are not otherwise used.
|
// Reference imports to suppress errors if they are not otherwise used.
|
||||||
var _ = proto.Marshal
|
var _ = proto.Marshal
|
||||||
|
|
|
@ -5,8 +5,8 @@ import (
|
||||||
"crypto/sha256"
|
"crypto/sha256"
|
||||||
"cwtch.im/cwtch/protocol"
|
"cwtch.im/cwtch/protocol"
|
||||||
"github.com/golang/protobuf/proto"
|
"github.com/golang/protobuf/proto"
|
||||||
"github.com/s-rah/go-ricochet/utils"
|
"git.openprivacy.ca/openprivacy/libricochet-go/utils"
|
||||||
"github.com/s-rah/go-ricochet/wire/control"
|
"git.openprivacy.ca/openprivacy/libricochet-go/wire/control"
|
||||||
"io"
|
"io"
|
||||||
//"fmt"
|
//"fmt"
|
||||||
)
|
)
|
||||||
|
|
|
@ -3,7 +3,7 @@ package spam
|
||||||
import (
|
import (
|
||||||
"cwtch.im/cwtch/protocol"
|
"cwtch.im/cwtch/protocol"
|
||||||
"github.com/golang/protobuf/proto"
|
"github.com/golang/protobuf/proto"
|
||||||
"github.com/s-rah/go-ricochet/wire/control"
|
"git.openprivacy.ca/openprivacy/libricochet-go/wire/control"
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -4,9 +4,9 @@ import (
|
||||||
"cwtch.im/cwtch/protocol"
|
"cwtch.im/cwtch/protocol"
|
||||||
"errors"
|
"errors"
|
||||||
"github.com/golang/protobuf/proto"
|
"github.com/golang/protobuf/proto"
|
||||||
"github.com/s-rah/go-ricochet/channels"
|
"git.openprivacy.ca/openprivacy/libricochet-go/channels"
|
||||||
"github.com/s-rah/go-ricochet/utils"
|
"git.openprivacy.ca/openprivacy/libricochet-go/utils"
|
||||||
"github.com/s-rah/go-ricochet/wire/control"
|
"git.openprivacy.ca/openprivacy/libricochet-go/wire/control"
|
||||||
)
|
)
|
||||||
|
|
||||||
// CwtchServerFetchChannel implements the ChannelHandler interface for a channel of
|
// CwtchServerFetchChannel implements the ChannelHandler interface for a channel of
|
||||||
|
|
|
@ -3,8 +3,8 @@ package fetch
|
||||||
import (
|
import (
|
||||||
"cwtch.im/cwtch/protocol"
|
"cwtch.im/cwtch/protocol"
|
||||||
"github.com/golang/protobuf/proto"
|
"github.com/golang/protobuf/proto"
|
||||||
"github.com/s-rah/go-ricochet/channels"
|
"git.openprivacy.ca/openprivacy/libricochet-go/channels"
|
||||||
"github.com/s-rah/go-ricochet/wire/control"
|
"git.openprivacy.ca/openprivacy/libricochet-go/wire/control"
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -4,9 +4,9 @@ import (
|
||||||
"cwtch.im/cwtch/protocol"
|
"cwtch.im/cwtch/protocol"
|
||||||
"errors"
|
"errors"
|
||||||
"github.com/golang/protobuf/proto"
|
"github.com/golang/protobuf/proto"
|
||||||
"github.com/s-rah/go-ricochet/channels"
|
"git.openprivacy.ca/openprivacy/libricochet-go/channels"
|
||||||
"github.com/s-rah/go-ricochet/utils"
|
"git.openprivacy.ca/openprivacy/libricochet-go/utils"
|
||||||
"github.com/s-rah/go-ricochet/wire/control"
|
"git.openprivacy.ca/openprivacy/libricochet-go/wire/control"
|
||||||
)
|
)
|
||||||
|
|
||||||
// CwtchServerListenChannel implements the ChannelHandler interface for a channel of
|
// CwtchServerListenChannel implements the ChannelHandler interface for a channel of
|
||||||
|
|
|
@ -3,8 +3,8 @@ package listen
|
||||||
import (
|
import (
|
||||||
"cwtch.im/cwtch/protocol"
|
"cwtch.im/cwtch/protocol"
|
||||||
"github.com/golang/protobuf/proto"
|
"github.com/golang/protobuf/proto"
|
||||||
"github.com/s-rah/go-ricochet/channels"
|
"git.openprivacy.ca/openprivacy/libricochet-go/channels"
|
||||||
"github.com/s-rah/go-ricochet/wire/control"
|
"git.openprivacy.ca/openprivacy/libricochet-go/wire/control"
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -5,8 +5,8 @@ import (
|
||||||
"cwtch.im/cwtch/protocol/spam"
|
"cwtch.im/cwtch/protocol/spam"
|
||||||
"errors"
|
"errors"
|
||||||
"github.com/golang/protobuf/proto"
|
"github.com/golang/protobuf/proto"
|
||||||
"github.com/s-rah/go-ricochet/channels"
|
"git.openprivacy.ca/openprivacy/libricochet-go/channels"
|
||||||
"github.com/s-rah/go-ricochet/wire/control"
|
"git.openprivacy.ca/openprivacy/libricochet-go/wire/control"
|
||||||
"log"
|
"log"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -4,8 +4,8 @@ import (
|
||||||
"cwtch.im/cwtch/protocol"
|
"cwtch.im/cwtch/protocol"
|
||||||
"cwtch.im/cwtch/protocol/spam"
|
"cwtch.im/cwtch/protocol/spam"
|
||||||
"github.com/golang/protobuf/proto"
|
"github.com/golang/protobuf/proto"
|
||||||
"github.com/s-rah/go-ricochet/channels"
|
"git.openprivacy.ca/openprivacy/libricochet-go/channels"
|
||||||
"github.com/s-rah/go-ricochet/wire/control"
|
"git.openprivacy.ca/openprivacy/libricochet-go/wire/control"
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -5,8 +5,8 @@ import (
|
||||||
"cwtch.im/cwtch/server/listen"
|
"cwtch.im/cwtch/server/listen"
|
||||||
"cwtch.im/cwtch/server/send"
|
"cwtch.im/cwtch/server/send"
|
||||||
"cwtch.im/cwtch/storage"
|
"cwtch.im/cwtch/storage"
|
||||||
"github.com/s-rah/go-ricochet/application"
|
"git.openprivacy.ca/openprivacy/libricochet-go/application"
|
||||||
"github.com/s-rah/go-ricochet/channels"
|
"git.openprivacy.ca/openprivacy/libricochet-go/channels"
|
||||||
"log"
|
"log"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@ package server
|
||||||
import (
|
import (
|
||||||
"crypto/rsa"
|
"crypto/rsa"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"github.com/s-rah/go-ricochet/utils"
|
"git.openprivacy.ca/openprivacy/libricochet-go/utils"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"log"
|
"log"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
|
@ -4,8 +4,8 @@ import (
|
||||||
"cwtch.im/cwtch/protocol"
|
"cwtch.im/cwtch/protocol"
|
||||||
"cwtch.im/cwtch/server/listen"
|
"cwtch.im/cwtch/server/listen"
|
||||||
"cwtch.im/cwtch/storage"
|
"cwtch.im/cwtch/storage"
|
||||||
"github.com/s-rah/go-ricochet/application"
|
"git.openprivacy.ca/openprivacy/libricochet-go/application"
|
||||||
"github.com/s-rah/go-ricochet/channels"
|
"git.openprivacy.ca/openprivacy/libricochet-go/channels"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Instance encapsulates the Ricochet application.
|
// Instance encapsulates the Ricochet application.
|
||||||
|
|
|
@ -3,7 +3,7 @@ package server
|
||||||
import (
|
import (
|
||||||
"cwtch.im/cwtch/protocol"
|
"cwtch.im/cwtch/protocol"
|
||||||
"cwtch.im/cwtch/storage"
|
"cwtch.im/cwtch/storage"
|
||||||
"github.com/s-rah/go-ricochet/application"
|
"git.openprivacy.ca/openprivacy/libricochet-go/application"
|
||||||
"os"
|
"os"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
|
@ -7,7 +7,7 @@ import (
|
||||||
"cwtch.im/cwtch/peer/connections"
|
"cwtch.im/cwtch/peer/connections"
|
||||||
cwtchserver "cwtch.im/cwtch/server"
|
cwtchserver "cwtch.im/cwtch/server"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/s-rah/go-ricochet/utils"
|
"git.openprivacy.ca/openprivacy/libricochet-go/utils"
|
||||||
"golang.org/x/net/proxy"
|
"golang.org/x/net/proxy"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"log"
|
"log"
|
||||||
|
|
Loading…
Reference in New Issue