Commit graph

655 commits

Author SHA1 Message Date
Florian 53d3432df1 Update boswatch.py
Check for existing config.ini
Without a config.ini there is no possibility to start BOSWatch; therefore it makes sense to put this check on the very beginning of the program.
2017-02-18 00:23:25 +01:00
Bastian Schroll f75d91f59b Merge pull request #214 from thejockel/develop
added basic error funcion
2017-02-17 14:06:55 +01:00
Jockel 052459c3e6 added basic error funcion 2017-02-17 13:04:56 +01:00
Bastian Schroll 8e0dbd0a7d Merge pull request #213 from thejockel/develop
Update path for 3rd-parties to local forks
2017-02-17 09:56:22 +01:00
Jockel bf2a5574e9 fix git syntax 2017-02-17 09:21:17 +01:00
Jockel 8371c50d3d update path 2017-02-17 08:41:34 +01:00
Jockel 3fe75fb595 update 2017-02-17 08:35:53 +01:00
Florian 2ef5a49601 Update install.sh
Check for being root user
2017-02-16 13:02:29 +01:00
Bastian Schroll 63e01a486d Merge pull request #208 from PeterLaemmle/master
Update Telegram.py
2017-02-14 20:57:23 +01:00
Bastian Schroll d245ae8776 fix spell error in fms.py 2017-02-14 08:17:31 +01:00
Bastian Schroll 566585d6d0 do som other code quallity changes 2017-02-12 10:32:17 +01:00
Bastian Schroll 3c00628b2d some edits for code quallity 2017-02-12 10:04:31 +01:00
Bastian Schroll 1c56509e25 Merged master into develop 2017-02-12 09:57:33 +01:00
PeterLaemmle df24ee4e9e Update Telegram.py
Added FMS and ZVEI support
2017-02-01 20:41:35 +01:00
Florian 8724cc64fe Update eMail.py
Adapting to master-branch (#200)
2017-01-25 22:03:04 +01:00
Bastian Schroll 881d4d7eb0 Merge pull request #202 from stereu/patch-5
Fixed CRC-Check Option Placement
2017-01-21 11:12:27 +01:00
stereu 2449dbc0fd Fixed CRC-Check Option Placement
CRC-Check Option muss im [FMS]-Tag platziert sein.
2017-01-20 23:12:22 +01:00
Bastian Schroll 26d4daf3b5 Merge pull request #200 from flothi/patch-4
Update eMail.py
2017-01-16 21:23:04 +01:00
Florian 20e9f567a0 Update eMail.py
Fixing if-condition for TLS
2017-01-16 21:22:22 +01:00
Florian 8cdfef4bce Update eMail.py
Using only SMTP via SSL can lead to errors depending on the configuration of the mail server
As there is no switch in the config file (which is good so) the approach is to use SSL first and, if this fails, switch to non-SSL connection.

Due to the importance of this plugin the pull request is affecting the master-branch.
2017-01-16 21:20:14 +01:00
Bastian Schroll ec31cfdbc5 Merge pull request #198 from flothi/patch-3
Update eMail.py
2017-01-16 16:07:34 +01:00
Bastian Schroll b84f84a420 Merge pull request #199 from flothi/flothi-fms-patch
FMS patch
2017-01-16 16:06:46 +01:00
Florian f996b72263 Update fms.py
- enabling to (not) use the CRC-check from multimon-ng
- fixing location-information with regard to TR-BOS (hex value is read as decimal value)

ATTENTION:
For proper usage multimon-ng is to be updated - please take the latest version from repository!
2017-01-16 14:07:11 +01:00
Florian 4f65b5159e Update decoder.py
Fixing typos
2017-01-16 14:03:51 +01:00
Florian 83ae6810ac Update config.template.ini
Adding switch to enable/disable CRC-checking provided by multimon-ng
2017-01-16 14:02:56 +01:00
Florian 7ad21a7a6d Update eMail.py
Fixing wrong variable - globals to globalVars
2017-01-16 13:08:17 +01:00
Bastian Schroll c5dbae209b Merge pull request #196 from flothi/patch-2
Update poc.py
2017-01-09 09:56:26 +01:00
Florian c7ee204c41 Update poc.py
Fixing wrong comment
2017-01-09 09:31:42 +01:00
Bastian Schroll 993c22e9c8 Merge pull request #195 from flothi/patch-1
Fixing filter
2017-01-08 23:48:17 +01:00
Florian 5c09b22cce Fixing filter
Fixing function for filtering RIC:
- if RIC is denied by config, finish function and return false (denied RIC is strongest way to filter)
- l. 64 - fixing missing 0
2017-01-08 12:21:44 +01:00
Bastian Schroll ac3a81686c Merge pull request #190 from flothi/develop
Globalizing net-identifiers (POC)
2016-12-23 09:07:24 +01:00
Florian 486464b680 boswatch.py
Set device to 0 by default
2016-12-22 22:44:56 +01:00
Florian 7390a539d3 MySQL.py
Adapting to global net-identifiers
2016-12-22 22:37:06 +01:00
Florian 7a636ceeae poc.py
Update filter-rules
2016-12-22 22:36:35 +01:00
Florian d37935bbf5 Globalizing net identifier
and some typos
2016-12-22 22:36:11 +01:00
Bastian Schroll 219e01537c Merge pull request #183 from flothi/patch-8
Update poc.py
2016-12-04 16:16:53 +01:00
Florian ae1c27b45f Update poc.py
Including upper and lower boundary
2016-12-03 15:39:35 +01:00
Florian 2ded273271 Update poc.py
Rewriting filter function so that both allow/deny-rule and filter-range will be evaluated. Suitable for e.g. signal-RIC
2016-12-03 14:49:22 +01:00
Bastian Schroll 9811f0b074 Merge pull request #178 from flothi/patch-7
Update wildcardHandler.py
2016-11-26 08:14:58 +01:00
Florian c96109899d Update wildcardHandler.py
Fixing problem that replacement has been tried whether POC was alarmed or ZVEI; works fine for both POC and ZVEI.

Original author might verify, works fine for me
2016-11-25 22:48:47 +01:00
Bastian Schroll 1535920fc9 Merge pull request #174 from flothi/patch-6
Update install.sh
2016-11-22 16:45:57 +01:00
flothi 42a09f2685 Update install.sh
Main function: Reconfigure the cursor to "normal" mode (l. 135) as it was invisible during installation
Additionally fixed some spelling
2016-11-22 12:54:53 +01:00
Bastian Schroll 45a9e790f8 Merge pull request #173 from flothi/patch-5
Update README.md
2016-11-22 07:57:15 +01:00
Bastian Schroll 7eb1067f8f Merge pull request #172 from flothi/patch-4
Update install.sh
2016-11-22 07:56:39 +01:00
flothi ae4c2a7de4 Update README.md
Deleting "wrong" installation instructions and pointing to wiki; some grammar is to be done later on as a basic instruction to install the software should be given here.
2016-11-22 00:33:29 +01:00
flothi 5ed0d20348 Update install.sh
Adding 1 LOC: preset of var reboot as false to prevent errors caused by checking in l. 135 - variable is set only if arg is given which is the reason for the error
2016-11-22 00:28:58 +01:00
Bastian Schroll 356595bfd3 Merged master into develop 2016-11-21 15:36:22 +01:00
Bastian Schroll 20b45bf036 Merge pull request #170 from flothi/patch-3
HOTFIX - config
2016-11-21 15:32:39 +01:00
Bastian Schroll 462cce8976 Merge pull request #169 from flothi/patch-2
HOTFIX - installer
2016-11-21 15:32:18 +01:00
flothi 8a82d049d4 Update config.template.ini
Added forgotten plugin switch for yowsup due to errors while BOSWatch misses it during startup
2016-11-21 14:31:21 +01:00