Skip to content

Commit

Permalink
point to current repo
Browse files Browse the repository at this point in the history
  • Loading branch information
lmangani committed Aug 26, 2024
1 parent 5a5c271 commit ac9e7ed
Show file tree
Hide file tree
Showing 24 changed files with 104 additions and 69 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ Downloading

To download the source code, install Go locally, then run:

$ go install github.com/google/stenographer@latest
$ go install github.com/qxip/stenographer@latest

Go will handle downloading and installing all Go libraries that `stenographer`
depends on. To build `stenotype`, go into the `stenotype` directory and run `make`.
Expand Down
10 changes: 5 additions & 5 deletions blockfile/blockfile.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ import (
"unsafe"

"github.com/google/gopacket"
"github.com/google/stenographer/base"
"github.com/google/stenographer/filecache"
"github.com/google/stenographer/indexfile"
"github.com/google/stenographer/query"
"github.com/google/stenographer/stats"
"github.com/qxip/stenographer/base"
"github.com/qxip/stenographer/filecache"
"github.com/qxip/stenographer/indexfile"
"github.com/qxip/stenographer/query"
"github.com/qxip/stenographer/stats"
"golang.org/x/net/context"
)

Expand Down
6 changes: 3 additions & 3 deletions blockfile/blockfile_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (

"golang.org/x/net/context"

"github.com/google/stenographer/base"
"github.com/google/stenographer/filecache"
"github.com/google/stenographer/query"
"github.com/qxip/stenographer/base"
"github.com/qxip/stenographer/filecache"
"github.com/qxip/stenographer/query"
)

var ctx = context.Background()
Expand Down
2 changes: 1 addition & 1 deletion config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"io/ioutil"
"net"

"github.com/google/stenographer/base"
"github.com/qxip/stenographer/base"
)

var v = base.V // verbose logging
Expand Down
4 changes: 2 additions & 2 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ Build-Depends: debhelper-compat (= 13),
libseccomp-dev,
txt2man
Standards-Version: 4.5.0
Homepage: https://github.com/google/stenographer
Homepage: https://github.com/qxip/stenographer
Vcs-Browser: https://salsa.debian.org/go-team/packages/stenographer
Vcs-Git: https://salsa.debian.org/go-team/packages/stenographer.git
XS-Go-Import-Path: github.com/google/stenographer
XS-Go-Import-Path: github.com/qxip/stenographer

Package: stenographer
Architecture: amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x alpha hppa hurd-i386 kfreebsd-amd64 kfreebsd-i386 m68k powerpc powerpcspe sh4 sparc64 x32
Expand Down
2 changes: 1 addition & 1 deletion debian/copyright
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: stenographer
Source: <https://github.com/google/stenographer>
Source: <https://github.com/qxip/stenographer>

Files: *
Copyright: 2014-2015 Google Inc.
Expand Down
2 changes: 1 addition & 1 deletion debian/stenographer.service
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

[Unit]
Description=packet capture to disk
Documentation=https://github.com/google/stenographer https://github.com/google/stenographer/blob/master/DESIGN.md https://github.com/google/stenographer/blob/master/INSTALL.md
Documentation=https://github.com/qxip/stenographer https://github.com/qxip/stenographer/blob/master/DESIGN.md https://github.com/qxip/stenographer/blob/master/INSTALL.md
After=network.target

[Service]
Expand Down
2 changes: 1 addition & 1 deletion debian/tests/run-example
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ systemctl is-active stenographer
curl 'http://www.debian.org' > /dev/null

# we need to wait a bit until packets appear in output, see
# https://github.com/google/stenographer/blob/master/DESIGN.md#packets-dont-show-up-immediately
# https://github.com/qxip/stenographer/blob/master/DESIGN.md#packets-dont-show-up-immediately
sleep 180

# add client user
Expand Down
8 changes: 4 additions & 4 deletions debian/upstream/metadata
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Bug-Database: https://github.com/google/stenographer/issues
Bug-Submit: https://github.com/google/stenographer/issues/new
Repository: https://github.com/google/stenographer.git
Repository-Browse: https://github.com/google/stenographer
Bug-Database: https://github.com/qxip/stenographer/issues
Bug-Submit: https://github.com/qxip/stenographer/issues/new
Repository: https://github.com/qxip/stenographer.git
Repository-Browse: https://github.com/qxip/stenographer
2 changes: 1 addition & 1 deletion debian/watch
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version=4

https://github.com/google/stenographer/releases .*/archive/v?@ANY_VERSION@@ARCHIVE_EXT@
https://github.com/qxip/stenographer/releases .*/archive/v?@ANY_VERSION@@ARCHIVE_EXT@
16 changes: 8 additions & 8 deletions env/env.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ import (
"strings"
"time"

"github.com/google/stenographer/base"
"github.com/google/stenographer/certs"
"github.com/google/stenographer/config"
"github.com/google/stenographer/filecache"
"github.com/google/stenographer/httputil"
"github.com/google/stenographer/query"
"github.com/google/stenographer/stats"
"github.com/google/stenographer/thread"
"github.com/qxip/stenographer/base"
"github.com/qxip/stenographer/certs"
"github.com/qxip/stenographer/config"
"github.com/qxip/stenographer/filecache"
"github.com/qxip/stenographer/httputil"
"github.com/qxip/stenographer/query"
"github.com/qxip/stenographer/stats"
"github.com/qxip/stenographer/thread"
"golang.org/x/net/context"
)

Expand Down
2 changes: 1 addition & 1 deletion filecache/filecache.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"sync"
"time"

"github.com/google/stenographer/base"
"github.com/qxip/stenographer/base"
)

var v = base.V
Expand Down
23 changes: 11 additions & 12 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,18 @@ module github.com/qxip/stenographer
go 1.22.5

require (
github.com/golang/leveldb v0.0.0-20170107010102-259d9253d719
github.com/golang/protobuf v1.5.4
github.com/google/gopacket v1.1.19
github.com/google/stenographer v1.0.1
github.com/google/uuid v1.6.0
golang.org/x/net v0.28.0
google.golang.org/grpc v1.65.0
github.com/golang/leveldb v0.0.0-20170107010102-259d9253d719
github.com/golang/protobuf v1.5.4
github.com/google/gopacket v1.1.19
github.com/google/uuid v1.6.0
golang.org/x/net v0.28.0
google.golang.org/grpc v1.65.0
)

require (
github.com/golang/snappy v0.0.4 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
google.golang.org/protobuf v1.34.1 // indirect
github.com/golang/snappy v0.0.4 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
google.golang.org/protobuf v1.34.1 // indirect
)
36 changes: 36 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
github.com/golang/leveldb v0.0.0-20170107010102-259d9253d719 h1:yahFtfWlyALYDkXw2ETowZqG4vi8hiE0yOEBOkpaXl0=
github.com/golang/leveldb v0.0.0-20170107010102-259d9253d719/go.mod h1:etEpE0xVqxA0N3WNUa5wic5HCNSsQvYm+PFNmOnx2iU=
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0=
google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc=
google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ=
google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
4 changes: 2 additions & 2 deletions httputil/httputil.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"strings"
"time"

"github.com/google/stenographer/base"
"github.com/google/stenographer/stats"
"github.com/qxip/stenographer/base"
"github.com/qxip/stenographer/stats"
)

// Context returns a new context.Content that cancels when the
Expand Down
6 changes: 3 additions & 3 deletions indexfile/indexfile.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import (
"strings"

"github.com/golang/leveldb/table"
"github.com/google/stenographer/base"
"github.com/google/stenographer/filecache"
"github.com/google/stenographer/stats"
"github.com/qxip/stenographer/base"
"github.com/qxip/stenographer/filecache"
"github.com/qxip/stenographer/stats"
"golang.org/x/net/context"
)

Expand Down
4 changes: 2 additions & 2 deletions indexfile/indexfile_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (

"golang.org/x/net/context"

"github.com/google/stenographer/base"
"github.com/google/stenographer/filecache"
"github.com/qxip/stenographer/base"
"github.com/qxip/stenographer/filecache"
)

var ctx = context.Background()
Expand Down
6 changes: 3 additions & 3 deletions query/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import (
"strings"
"time"

"github.com/google/stenographer/base"
"github.com/google/stenographer/indexfile"
"github.com/google/stenographer/stats"
"github.com/qxip/stenographer/base"
"github.com/qxip/stenographer/indexfile"
"github.com/qxip/stenographer/stats"
"golang.org/x/net/context"
)

Expand Down
4 changes: 2 additions & 2 deletions rpc/rpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"

"github.com/google/stenographer/config"
pb "github.com/google/stenographer/protobuf"
"github.com/qxip/stenographer/config"
pb "github.com/qxip/stenographer/protobuf"
)


Expand Down
2 changes: 1 addition & 1 deletion rpmbuild-steno-centos
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ TMP=`mktemp -d`
pushd $TMP

# pull lastest versions checked in to github
curl -L -J -O https://github.com/google/stenographer/archive/$commit.tar.gz
curl -L -J -O https://github.com/qxip/stenographer/archive/$commit.tar.gz

# create working directory for rpmbuild to use
mkdir -p $TMP/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
Expand Down
8 changes: 4 additions & 4 deletions stenographer.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ import (
"os"
"runtime"

"github.com/google/stenographer/base"
"github.com/google/stenographer/config"
"github.com/google/stenographer/env"
"github.com/google/stenographer/rpc"
"github.com/qxip/stenographer/base"
"github.com/qxip/stenographer/config"
"github.com/qxip/stenographer/env"
"github.com/qxip/stenographer/rpc"

_ "net/http/pprof" // server debugging info in /debug/pprof/*
)
Expand Down
2 changes: 1 addition & 1 deletion stenographer.spec
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Release: 1.%{builddate}git%{shortcommit0}%{?dist}
Summary: A high-speed packet capture solution that provides indexed access

License: Apache License, 2.0
URL: https://github.com/google/stenographer
URL: https://github.com/qxip/stenographer
Source0: https://github.com/google/%{name}/archive/%{commit0}.tar.gz#/%{name}-%{commit0}.tar.gz

BuildRequires: libaio-devel, leveldb-devel, snappy-devel, gcc-c++, make
Expand Down
16 changes: 8 additions & 8 deletions thread/thread.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ import (
"sync"
"time"

"github.com/google/stenographer/base"
"github.com/google/stenographer/blockfile"
"github.com/google/stenographer/config"
"github.com/google/stenographer/filecache"
"github.com/google/stenographer/httputil"
"github.com/google/stenographer/indexfile"
"github.com/google/stenographer/query"
"github.com/google/stenographer/stats"
"github.com/qxip/stenographer/base"
"github.com/qxip/stenographer/blockfile"
"github.com/qxip/stenographer/config"
"github.com/qxip/stenographer/filecache"
"github.com/qxip/stenographer/httputil"
"github.com/qxip/stenographer/indexfile"
"github.com/qxip/stenographer/query"
"github.com/qxip/stenographer/stats"
"golang.org/x/net/context"
)

Expand Down
4 changes: 2 additions & 2 deletions thread/thread_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"strings"
"testing"

"github.com/google/stenographer/config"
"github.com/google/stenographer/filecache"
"github.com/qxip/stenographer/config"
"github.com/qxip/stenographer/filecache"
)

const (
Expand Down

0 comments on commit ac9e7ed

Please sign in to comment.