Commit graph

61 commits

Author SHA1 Message Date
Jan-Philipp Litza e54e7467fc Create package ffmap, add wiki input, remove old code 2014-07-08 14:20:47 +02:00
Jan-Philipp Litza f5e3705eec Began rewrite with more modular design 2014-07-07 23:27:21 +02:00
Jan-Philipp Litza 6fc1423124 Make handling of node attributes more flexible.
This commit makes Nodes special dicts that return None-like objects for
inexistent keys, making it a dynamic attribute store.

Also, it removes the D3MapBuilder and moves its logic to the Node and
Link classes' newly introduced export() method. Only they need to be
changed to populate the final nodes.json with more attributes.
2014-07-06 20:03:10 +02:00
Nils Schneider f18d0b38a9 bugs 2014-05-31 14:53:38 +02:00
Nils Schneider 26fc2a9aef alfred: use network.mac as ID if present 2014-05-02 10:49:32 +02:00
Linus Lüssing 605765cd12 try non-fuzzy prior fuzzy mac matching
Fuzzy matching should only be tried if there's no exact match. Otherwise
a node in the map might get the wrong label.
2014-05-02 04:10:39 +02:00
Nils Schneider ac3366ff13 count clients and add clientcount attribute to each node 2014-04-10 17:17:11 +02:00
Daniel Ehlers 613fa425ed nodedb.py: stop similar mac address check when parts are not equal 2014-02-04 15:54:04 +01:00
Nils Schneider 914836eb9a alfred.py: pass firmware version to nodes.json 2014-02-02 23:30:16 +01:00
Andreas Baldeau ddf7e4f8db Fixed variable name and catches only KeyErrors to not hide other errors. 2014-01-31 22:15:30 +01:00
Andreas Baldeau cd743ff46c Fixes client mac obfuscation. Node to node links stay untouched now. 2014-01-31 22:15:30 +01:00
Daniel Ehlers d9451e2ea7 alfred: Mark all nodes from legacy support. 2014-01-30 22:12:33 +01:00
Daniel Ehlers 53d8f4bcf2 Fix exception handling and remove debug output 2013-12-29 20:20:33 +01:00
Andreas Baldeau a0c234ea05 Add client mac obscuring methods. 2013-12-29 13:11:53 +01:00
Daniel Ehlers 90106313eb Method for searching a node by id. 2013-12-29 04:14:07 +01:00
Daniel Ehlers 44c92ff65f Refactor batctl calls into python class.
This drastically reduces the logic implement in mkmap.sh and also
supports multiple batman mesh interfaces.
2013-11-21 01:27:13 +01:00
Nils Schneider ec03ffe810 use fuzzy mac matching when importing aliases 2013-02-02 02:44:49 +01:00
Nils Schneider db4dec7270 handle aliases without names 2013-02-02 01:27:49 +01:00
Nils Schneider 3ffbac8136 remove wikiimport from nodedb, move to ffhlwiki.py and call it from mkmap.sh 2013-02-02 01:21:29 +01:00
Nils Schneider 5613fa2f61 include offline nodes from aliases.json in output 2012-11-22 02:35:14 +01:00
Nils Schneider c8a4882f38 fix handling of wiki entries with multiple nodes 2012-09-05 00:59:13 +02:00
Nils Schneider 1ed42ab9ee Nick -> Knotenname 2012-08-22 20:47:17 +02:00
Nils Schneider 51701dfde8 use copy of mac, not reference 2012-08-21 00:10:37 +02:00
Nils Schneider f67b8df1bc add wiki mac to macs 2012-08-20 23:45:35 +02:00
Nils Schneider a6d7e4e1f3 modulo 255 when incrementing macs 2012-08-20 23:44:31 +02:00
Nils Schneider 92b454f1cc much better mac matching 2012-08-20 23:00:39 +02:00
Nils Schneider ac10d7aabc Revert "better mac matching"
This reverts commit ac5c4b5693.
2012-08-20 22:59:32 +02:00
Nils Schneider ac5c4b5693 better mac matching 2012-08-20 22:05:01 +02:00
Nils Schneider ecc7aed694 actually fix fuzzy matching 2012-07-08 02:09:00 +02:00
Nils Schneider 8aa71d62e5 fuzzy mac matching for wiki imports 2012-07-08 01:30:21 +02:00
Nils Schneider a8a9ed9c8d refactor mac similarity check into its own function 2012-07-07 23:11:37 +02:00
Nils Schneider f7f8225d1f allow setting gps from aliases.json 2012-06-30 16:49:45 +02:00
Nils Schneider a10ad4baf2 do not fail on non-mac node IDs 2012-06-30 16:46:53 +02:00
Nils Schneider c6e1cf2acd hide neighbors without primary/secondary entry 2012-06-15 18:23:03 +02:00
Nils Schneider 5484c34581 don't hide vpn hosts, only hide links 2012-06-12 02:26:41 +02:00
Nils Schneider a0adb74269 move vpn flag to aliases 2012-06-12 02:12:48 +02:00
Nils Schneider 0d24e4518f fix link loops 2012-06-12 00:32:13 +02:00
Nils Schneider b1eaf86d30 lots of changes to support inter-node vpn links 2012-06-11 23:53:45 +02:00
Nils Schneider 80c2cd394b remove link.distance/strength, tweak parameters 2012-06-07 22:58:45 +02:00
Nils Schneider 523384d64c remove group foo and replace it with flags 2012-06-07 22:21:50 +02:00
Nils Schneider 32ee0a7032 allow nicks without gps coordinates 2012-06-06 21:43:13 +02:00
Nils Schneider 471c17f31e remove wilder_scheiss 2012-06-06 16:18:23 +02:00
Nils Schneider ed938a2d64 don't count merged TT links 2012-06-06 14:19:45 +02:00
Nils Schneider ad618ff010 try to figure out which TT links are MACs of the node itself 2012-06-06 13:57:10 +02:00
Nils Schneider 33ba6a6d33 update to python3 2012-06-05 17:40:21 +02:00
Nils Schneider 0c74bf3224 use worst link quality 2012-06-05 16:32:47 +02:00
Nils Schneider e9ecf8f447 fix link quality again 2012-06-04 20:58:17 +02:00
Nils Schneider 492dec92c1 fix link quality display 2012-06-04 20:47:05 +02:00
Nils Schneider 2174c57b8b bugfix 2012-06-04 19:05:16 +02:00
Nils Schneider eba95718cb bugfix 2012-06-04 19:02:12 +02:00