aboutsummaryrefslogtreecommitdiffstats
path: root/syz-hub
diff options
context:
space:
mode:
Diffstat (limited to 'syz-hub')
-rw-r--r--syz-hub/http.go12
-rw-r--r--syz-hub/hub.go36
-rw-r--r--syz-hub/state/state.go38
3 files changed, 43 insertions, 43 deletions
diff --git a/syz-hub/http.go b/syz-hub/http.go
index f7a01c91b..9887015e0 100644
--- a/syz-hub/http.go
+++ b/syz-hub/http.go
@@ -11,7 +11,7 @@ import (
"sort"
"strings"
- . "github.com/google/syzkaller/pkg/log"
+ "github.com/google/syzkaller/pkg/log"
)
func (hub *Hub) initHTTP(addr string) {
@@ -19,12 +19,12 @@ func (hub *Hub) initHTTP(addr string) {
ln, err := net.Listen("tcp4", addr)
if err != nil {
- Fatalf("failed to listen on %v: %v", addr, err)
+ log.Fatalf("failed to listen on %v: %v", addr, err)
}
- Logf(0, "serving http on http://%v", ln.Addr())
+ log.Logf(0, "serving http on http://%v", ln.Addr())
go func() {
err := http.Serve(ln, nil)
- Fatalf("failed to serve http: %v", err)
+ log.Fatalf("failed to serve http: %v", err)
}()
}
@@ -33,7 +33,7 @@ func (hub *Hub) httpSummary(w http.ResponseWriter, r *http.Request) {
defer hub.mu.Unlock()
data := &UISummaryData{
- Log: CachedLogOutput(),
+ Log: log.CachedLogOutput(),
}
total := UIManager{
Name: "total",
@@ -59,7 +59,7 @@ func (hub *Hub) httpSummary(w http.ResponseWriter, r *http.Request) {
sort.Sort(UIManagerArray(data.Managers))
data.Managers = append([]UIManager{total}, data.Managers...)
if err := summaryTemplate.Execute(w, data); err != nil {
- Logf(0, "failed to execute template: %v", err)
+ log.Logf(0, "failed to execute template: %v", err)
http.Error(w, fmt.Sprintf("failed to execute template: %v", err), http.StatusInternalServerError)
return
}
diff --git a/syz-hub/hub.go b/syz-hub/hub.go
index f8509f3a3..259265576 100644
--- a/syz-hub/hub.go
+++ b/syz-hub/hub.go
@@ -10,8 +10,8 @@ import (
"sync"
"github.com/google/syzkaller/pkg/config"
- . "github.com/google/syzkaller/pkg/log"
- . "github.com/google/syzkaller/pkg/rpctype"
+ "github.com/google/syzkaller/pkg/log"
+ "github.com/google/syzkaller/pkg/rpctype"
"github.com/google/syzkaller/syz-hub/state"
)
@@ -39,13 +39,13 @@ func main() {
flag.Parse()
cfg := new(Config)
if err := config.LoadFile(*flagConfig, cfg); err != nil {
- Fatal(err)
+ log.Fatal(err)
}
- EnableLogCaching(1000, 1<<20)
+ log.EnableLogCaching(1000, 1<<20)
st, err := state.Make(cfg.Workdir)
if err != nil {
- Fatalf("failed to load state: %v", err)
+ log.Fatalf("failed to load state: %v", err)
}
hub := &Hub{
st: st,
@@ -57,15 +57,15 @@ func main() {
hub.initHTTP(cfg.HTTP)
- s, err := NewRPCServer(cfg.RPC, hub)
+ s, err := rpctype.NewRPCServer(cfg.RPC, hub)
if err != nil {
- Fatalf("failed to create rpc server: %v", err)
+ log.Fatalf("failed to create rpc server: %v", err)
}
- Logf(0, "serving rpc on tcp://%v", s.Addr())
+ log.Logf(0, "serving rpc on tcp://%v", s.Addr())
s.Serve()
}
-func (hub *Hub) Connect(a *HubConnectArgs, r *int) error {
+func (hub *Hub) Connect(a *rpctype.HubConnectArgs, r *int) error {
name, err := hub.auth(a.Client, a.Key, a.Manager)
if err != nil {
return err
@@ -73,16 +73,16 @@ func (hub *Hub) Connect(a *HubConnectArgs, r *int) error {
hub.mu.Lock()
defer hub.mu.Unlock()
- Logf(0, "connect from %v: fresh=%v calls=%v corpus=%v",
+ log.Logf(0, "connect from %v: fresh=%v calls=%v corpus=%v",
name, a.Fresh, len(a.Calls), len(a.Corpus))
if err := hub.st.Connect(name, a.Fresh, a.Calls, a.Corpus); err != nil {
- Logf(0, "connect error: %v", err)
+ log.Logf(0, "connect error: %v", err)
return err
}
return nil
}
-func (hub *Hub) Sync(a *HubSyncArgs, r *HubSyncRes) error {
+func (hub *Hub) Sync(a *rpctype.HubSyncArgs, r *rpctype.HubSyncRes) error {
name, err := hub.auth(a.Client, a.Key, a.Manager)
if err != nil {
return err
@@ -92,39 +92,39 @@ func (hub *Hub) Sync(a *HubSyncArgs, r *HubSyncRes) error {
progs, more, err := hub.st.Sync(name, a.Add, a.Del)
if err != nil {
- Logf(0, "sync error: %v", err)
+ log.Logf(0, "sync error: %v", err)
return err
}
r.Progs = progs
r.More = more
for _, repro := range a.Repros {
if err := hub.st.AddRepro(name, repro); err != nil {
- Logf(0, "add repro error: %v", err)
+ log.Logf(0, "add repro error: %v", err)
}
}
if a.NeedRepros {
repro, err := hub.st.PendingRepro(name)
if err != nil {
- Logf(0, "sync error: %v", err)
+ log.Logf(0, "sync error: %v", err)
}
if repro != nil {
r.Repros = [][]byte{repro}
}
}
- Logf(0, "sync from %v: recv: add=%v del=%v repros=%v; send: progs=%v repros=%v pending=%v",
+ log.Logf(0, "sync from %v: recv: add=%v del=%v repros=%v; send: progs=%v repros=%v pending=%v",
name, len(a.Add), len(a.Del), len(a.Repros), len(r.Progs), len(r.Repros), more)
return nil
}
func (hub *Hub) auth(client, key, manager string) (string, error) {
if expectedKey, ok := hub.keys[client]; !ok || key != expectedKey {
- Logf(0, "connect from unauthorized client %v", client)
+ log.Logf(0, "connect from unauthorized client %v", client)
return "", fmt.Errorf("unauthorized manager")
}
if manager == "" {
manager = client
} else if !strings.HasPrefix(manager, client) {
- Logf(0, "manager %v does not have client prefix %v", manager, client)
+ log.Logf(0, "manager %v does not have client prefix %v", manager, client)
return "", fmt.Errorf("unauthorized manager")
}
return manager, nil
diff --git a/syz-hub/state/state.go b/syz-hub/state/state.go
index d04377166..cbeaff9f0 100644
--- a/syz-hub/state/state.go
+++ b/syz-hub/state/state.go
@@ -14,7 +14,7 @@ import (
"github.com/google/syzkaller/pkg/db"
"github.com/google/syzkaller/pkg/hash"
- . "github.com/google/syzkaller/pkg/log"
+ "github.com/google/syzkaller/pkg/log"
"github.com/google/syzkaller/pkg/osutil"
"github.com/google/syzkaller/prog"
)
@@ -73,29 +73,29 @@ func Make(dir string) (*State, error) {
return nil, err
}
}
- Logf(0, "purging corpus...")
+ log.Logf(0, "purging corpus...")
st.purgeCorpus()
- Logf(0, "done, %v programs", len(st.Corpus.Records))
+ log.Logf(0, "done, %v programs", len(st.Corpus.Records))
return st, err
}
func loadDB(file, name string) (*db.DB, uint64) {
- Logf(0, "reading %v...", name)
+ log.Logf(0, "reading %v...", name)
db, err := db.Open(file)
if err != nil {
- Fatalf("failed to open %v database: %v", name, err)
+ log.Fatalf("failed to open %v database: %v", name, err)
}
- Logf(0, "read %v programs", len(db.Records))
+ log.Logf(0, "read %v programs", len(db.Records))
var maxSeq uint64
for key, rec := range db.Records {
if _, err := prog.CallSet(rec.Val); err != nil {
- Logf(0, "bad file: can't parse call set: %v", err)
+ log.Logf(0, "bad file: can't parse call set: %v", err)
db.Delete(key)
continue
}
if sig := hash.Hash(rec.Val); sig.String() != key {
- Logf(0, "bad file: hash %v, want hash %v", key, sig.String())
+ log.Logf(0, "bad file: hash %v, want hash %v", key, sig.String())
db.Delete(key)
continue
}
@@ -104,7 +104,7 @@ func loadDB(file, name string) (*db.DB, uint64) {
}
}
if err := db.Flush(); err != nil {
- Fatalf("failed to flush corpus database: %v", err)
+ log.Fatalf("failed to flush corpus database: %v", err)
}
return db, maxSeq
}
@@ -135,7 +135,7 @@ func (st *State) createManager(name string) (*Manager, error) {
if err != nil {
return nil, fmt.Errorf("failed to open manager corpus %v: %v", mgr.corpusFile, err)
}
- Logf(0, "created manager %v: corpus=%v, corpusSeq=%v, reproSeq=%v",
+ log.Logf(0, "created manager %v: corpus=%v, corpusSeq=%v, reproSeq=%v",
mgr.name, len(mgr.Corpus.Records), mgr.corpusSeq, mgr.reproSeq)
st.Managers[name] = mgr
return mgr, nil
@@ -167,7 +167,7 @@ func (st *State) Connect(name string, fresh bool, calls []string, corpus [][]byt
var err error
mgr.Corpus, err = db.Open(mgr.corpusFile)
if err != nil {
- Logf(0, "failed to open corpus database: %v", err)
+ log.Logf(0, "failed to open corpus database: %v", err)
return err
}
st.addInputs(mgr, corpus)
@@ -185,7 +185,7 @@ func (st *State) Sync(name string, add [][]byte, del []string) ([][]byte, int, e
mgr.Corpus.Delete(sig)
}
if err := mgr.Corpus.Flush(); err != nil {
- Logf(0, "failed to flush corpus database: %v", err)
+ log.Logf(0, "failed to flush corpus database: %v", err)
}
st.purgeCorpus()
}
@@ -203,7 +203,7 @@ func (st *State) AddRepro(name string, repro []byte) error {
return fmt.Errorf("unconnected manager %v", name)
}
if _, err := prog.CallSet(repro); err != nil {
- Logf(0, "manager %v: failed to extract call set: %v, program:\n%v",
+ log.Logf(0, "manager %v: failed to extract call set: %v, program:\n%v",
mgr.name, err, string(repro))
return nil
}
@@ -220,7 +220,7 @@ func (st *State) AddRepro(name string, repro []byte) error {
st.reproSeq++
st.Repros.Save(sig, repro, st.reproSeq)
if err := st.Repros.Flush(); err != nil {
- Logf(0, "failed to flush repro database: %v", err)
+ log.Logf(0, "failed to flush repro database: %v", err)
}
return nil
}
@@ -319,16 +319,16 @@ func (st *State) addInputs(mgr *Manager, inputs [][]byte) {
st.addInput(mgr, input)
}
if err := mgr.Corpus.Flush(); err != nil {
- Logf(0, "failed to flush corpus database: %v", err)
+ log.Logf(0, "failed to flush corpus database: %v", err)
}
if err := st.Corpus.Flush(); err != nil {
- Logf(0, "failed to flush corpus database: %v", err)
+ log.Logf(0, "failed to flush corpus database: %v", err)
}
}
func (st *State) addInput(mgr *Manager, input []byte) {
if _, err := prog.CallSet(input); err != nil {
- Logf(0, "manager %v: failed to extract call set: %v, program:\n%v", mgr.name, err, string(input))
+ log.Logf(0, "manager %v: failed to extract call set: %v, program:\n%v", mgr.name, err, string(input))
return
}
sig := hash.String(input)
@@ -352,7 +352,7 @@ func (st *State) purgeCorpus() {
st.Corpus.Delete(key)
}
if err := st.Corpus.Flush(); err != nil {
- Logf(0, "failed to flush corpus database: %v", err)
+ log.Logf(0, "failed to flush corpus database: %v", err)
}
}
@@ -367,7 +367,7 @@ func managerSupportsAllCalls(mgr, prog map[string]struct{}) bool {
func writeFile(name string, data []byte) {
if err := osutil.WriteFile(name, data); err != nil {
- Logf(0, "failed to write file %v: %v", name, err)
+ log.Logf(0, "failed to write file %v: %v", name, err)
}
}
generated by ggit (джигит) mrf-deployment (git 2.46.0) at 2026-03-11 17:51:46 +0000