ffhb/yanic
ffhb
/
yanic
mirror of https://github.com/FreifunkBremen/yanic.git
1
0
Fork 0
Code Issues Releases Wiki Activity

[TASK] Add editorconfig & format code (#94)

This commit is contained in:
Xaver Maierhofer 2017-11-06 00:59:42 +01:00 committed by Julian K
parent 918b279b23
commit 93321ab3ad
8 changed files with 184 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.editorconfig Normal file
View File

@ -0,0 +1,17 @@
; http://editorconfig.org/
root = true
[*]
end_of_line = lf
insert_final_newline = true
charset = utf-8
trim_trailing_whitespace = true
[*.go]
indent_style = tab
indent_size = 4
[*.{json,yml}]
indent_style = space
indent_size = 2

4
contrib/yanic-remove-node
View File

@ -1,6 +1,6 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import json
import argparse import argparse
import json
import sys import sys
@ -18,6 +18,7 @@ def main(states, nodeid):
with open(states, 'w') as handle: with open(states, 'w') as handle:
json.dump(data, handle) json.dump(data, handle)
if __name__ == '__main__': if __name__ == '__main__':
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
@ -29,4 +30,3 @@ if __name__ == '__main__':
args = parser.parse_args() args = parser.parse_args()
main(args.states, args.nodeid) main(args.states, args.nodeid)

1
respond/respond.go
View File

@ -8,7 +8,6 @@ import (
var multiCastGroup = net.ParseIP("ff02:0:0:0:0:0:2:1001") var multiCastGroup = net.ParseIP("ff02:0:0:0:0:0:2:1001")
const ( const (
// default udp port used by announced // default udp port used by announced
port = 1001 port = 1001

66
runtime/testdata/node1.json vendored
View File

@ -1,30 +1,42 @@
{ {
"nodeinfo":{ "nodeinfo": {
"node_id":"node1.json", "node_id": "node1.json",
"network":{ "network": {
"mac": "a", "mac": "a",
"mesh":{ "mesh": {
"bat0":{ "bat0": {
"interfaces":{ "interfaces": {
"wireless":["a"], "wireless": [
"other":["a2"] "a"
} ],
} "other": [
} "a2"
} ]
}, }
"neighbours":{ }
"batadv":{ }
"a":{ }
"neighbours":{ },
"b":{"tq":150,"lastseen":0.42}, "neighbours": {
"c":{"tq":250,"lastseen":0.42} "batadv": {
} "a": {
} "neighbours": {
}, "b": {
"lldp":{ "tq": 150,
"a2": {"c2": {}} "lastseen": 0.42
} },
} "c": {
"tq": 250,
"lastseen": 0.42
}
}
}
},
"lldp": {
"a2": {
"c2": {}
}
}
}
} }

47
runtime/testdata/node2.json vendored
View File

@ -1,24 +1,29 @@
{ {
"nodeinfo":{ "nodeinfo": {
"node_id":"node2.json", "node_id": "node2.json",
"network":{ "network": {
"mesh":{ "mesh": {
"bat0":{ "bat0": {
"interfaces":{ "interfaces": {
"wireless":["b"] "wireless": [
} "b"
} ]
} }
} }
}, }
"neighbours":{ }
"batadv":{ },
"b":{ "neighbours": {
"neighbours":{ "batadv": {
"a":{"tq":250,"lastseen":0.42} "b": {
} "neighbours": {
} "a": {
} "tq": 250,
} "lastseen": 0.42
}
}
}
}
}
} }

59
runtime/testdata/node3.json vendored
View File

@ -1,28 +1,37 @@
{ {
"nodeinfo":{ "nodeinfo": {
"node_id":"node3.json", "node_id": "node3.json",
"network":{ "network": {
"mesh":{ "mesh": {
"bat0":{ "bat0": {
"interfaces":{ "interfaces": {
"wireless":["c"], "wireless": [
"other":["c2"] "c"
} ],
} "other": [
} "c2"
} ]
}, }
"neighbours":{ }
"batadv":{ }
"c":{ }
"neighbours":{ },
"a":{"tq":200,"lastseen":0.42} "neighbours": {
} "batadv": {
} "c": {
}, "neighbours": {
"lldp":{ "a": {
"c2": {"a2": {}} "tq": 200,
} "lastseen": 0.42
} }
}
}
},
"lldp": {
"c2": {
"a2": {}
}
}
}
} }

52
runtime/testdata/node4.json vendored
View File

@ -1,25 +1,33 @@
{ {
"nodeinfo":{ "nodeinfo": {
"node_id":"node4.json", "node_id": "node4.json",
"network":{ "network": {
"mesh":{ "mesh": {
"bat0":{ "bat0": {
"interfaces":{ "interfaces": {
"wireless":["unneed","unneed2"], "wireless": [
"tunnel":["d"] "unneed",
} "unneed2"
} ],
} "tunnel": [
} "d"
}, ]
"neighbours":{ }
"batadv":{ }
"d":{ }
"neighbours":{ }
"a":{"tq":200,"lastseen":0.42} },
} "neighbours": {
} "batadv": {
} "d": {
} "neighbours": {
"a": {
"tq": 200,
"lastseen": 0.42
}
}
}
}
}
} }

68
runtime/testdata/nodes.json vendored
View File

@ -1,34 +1,38 @@
{ {
"nodes": { "nodes": {
"f4f26dd7a30a": { "f4f26dd7a30a": {
"firstseen": "2017-03-10T12:12:01", "firstseen": "2017-03-10T12:12:01",
"nodeinfo": { "nodeinfo": {
"node_id":"f4f26dd7a30a", "node_id": "f4f26dd7a30a",
"network":{ "network": {
"mesh":{ "mesh": {
"bat0":{ "bat0": {
"interfaces":{ "interfaces": {
"wireless":["a"] "wireless": [
} "a"
} ]
} }
} }
} }
}, }
"f4f26dd7a30b": { }
"firstseen": "2016-03-10T12:12:01", },
"nodeinfo": { "f4f26dd7a30b": {
"node_id":"f4f26dd7a30b", "firstseen": "2016-03-10T12:12:01",
"network":{ "nodeinfo": {
"mesh":{ "node_id": "f4f26dd7a30b",
"bat0":{ "network": {
"interfaces":{ "mesh": {
"wireless":["a"] "bat0": {
} "interfaces": {
} "wireless": [
} "a"
} ]
} }
} }
} }
}
}
}
}
} }