Compare commits

...

217 Commits

Author SHA1 Message Date
Jakob Olsson
2117bc1903 Update feed [ feed_inteno_packages ] package [ onboardingd ]
-------------------------------------------------------------------------------
* 1b8501d fix enable pin, add get signal strength
* 6db2741 add set_pin, disable_pin
-------------------------------------------------------------------------------
commit 1b8501d5a24fcdf784678e8f864964fc0138254c
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-05-04 14:04:47 +0200

    fix enable pin, add get signal strength

Base directory -> /
 dongle_network.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 dongle_pin.c     | 58 ++++++++++++++++++++++++++++++++++++++++++++-
 libmobile.c      |  4 ++--
 libmobile.h      |  2 +-
 4 files changed, 131 insertions(+), 4 deletions(-)
-------------------------------------------------------------------------------
commit 6db274197ef6151d119335d99e85dbbbbc788978
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-05-04 12:54:09 +0200

    add set_pin, disable_pin

Base directory -> /
 dongle_pin.c | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 libmobile.c  | 112 +++++++++++++++++++++++++++++++++++++++++++++---
 libmobile.h  |   4 ++
 3 files changed, 238 insertions(+), 15 deletions(-)
-------------------------------------------------------------------------------
2018-05-04 14:05:25 +02:00
Jakob Olsson
b553a6bb9f new binary to add 2018-05-04 14:05:10 +02:00
Jakob Olsson
6a2e0a259e Update feed [ feed_inteno_packages ] package [ onboardingd ]
-------------------------------------------------------------------------------
* 01d0e03 accomodate for splitting files, some test code for pin
* 5eb1ecb rename file and object
* f01ee70 remove remaining curls from dongle.c, remove duplicate function, TODO: naming scheme, run cppcheck, checkpatch
* 911c050 move (most) curl code to libmobile, still some remaining in dongle, write_func duplicate, TODO: consistent returns, clean memory?
* 76f11f2 add delete, set (default apn), and show current apn, some cleanup
* c39d839 add list_apn_profiles, listing the APN_config names, essentiall listing their names
* 89d9e82 dynamically find index fix
* 634b533 can send post request to add new APN profile, TODO: add dynamic idx, set_default(), apply()
* 85beb1d add preliminary functionality & ubus method for setting APN
* 2a6dd7c Merge branch 'jakob' of private.inteno.se:iopsys-onboarding into HEAD
* 28356f4 add referer to dongle
-------------------------------------------------------------------------------
commit 01d0e038fd26a2fc5a483ad4bf2c7f7accd5820c
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-05-04 09:14:16 +0200

    accomodate for splitting files, some test code for pin

Base directory -> /
 Makefile     | 16 ++++++-----
 dongle_apn.c | 48 +--------------------------------
 dongle_pin.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 libmobile.c  | 74 +++++++++++++++++++++++++++++++--------------------
 4 files changed, 143 insertions(+), 82 deletions(-)
-------------------------------------------------------------------------------
commit 5eb1ecbb3fd267917df4ed5b387f840d59db8ba1
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-05-03 16:52:24 +0200

    rename file and object

Base directory -> /
 dongle.c     | 255 -----------------------------------------------------------
 dongle_apn.c | 255 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 255 insertions(+), 255 deletions(-)
-------------------------------------------------------------------------------
commit f01ee707753f66ed918f9603d4e9f98975ba882b
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-05-03 16:48:31 +0200

    remove remaining curls from dongle.c, remove duplicate function, TODO:
    naming scheme, run cppcheck, checkpatch

Base directory -> /
 dongle.c    | 53 +++++------------------------------------------------
 libmobile.c | 35 +++++++++++++++++++++++++++++++++++
 libmobile.h |  3 ++-
 3 files changed, 42 insertions(+), 49 deletions(-)
-------------------------------------------------------------------------------
commit 911c05069f03c08dd45692333318134c4a00cc9e
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-05-03 16:35:20 +0200

    move (most) curl code to libmobile, still some remaining in dongle,
    write_func duplicate, TODO: consistent returns, clean memory?

Base directory -> /
 Makefile    |  12 ++-
 dongle.c    | 224 +++++---------------------------------------------------
 libmobile.c | 238 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 libmobile.h |  17 +++++
 4 files changed, 282 insertions(+), 209 deletions(-)
-------------------------------------------------------------------------------
commit 76f11f2f6fd746d36b0a5f8def09153e0ddb77c1
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-05-03 14:54:01 +0200

    add delete, set (default apn), and show current apn, some cleanup

Base directory -> /
 dongle.c | 227 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 205 insertions(+), 22 deletions(-)
-------------------------------------------------------------------------------
commit c39d83953dba361d676e247002b7f63e5c4851bf
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-05-03 12:22:06 +0200

    add list_apn_profiles, listing the APN_config names, essentiall listing
    their names

Base directory -> /
 dongle.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 61 insertions(+), 16 deletions(-)
-------------------------------------------------------------------------------
commit 89d9e82bf0d68adbd110774f989a557a500eabee
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-05-03 11:20:02 +0200

    dynamically find index fix

Base directory -> /
 dongle.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 65 insertions(+), 16 deletions(-)
-------------------------------------------------------------------------------
commit 634b5338b59cf65e22d645996d785ce9260862c0
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-05-03 09:25:33 +0200

    can send post request to add new APN profile, TODO: add dynamic idx,
    set_default(), apply()

Base directory -> /
 dongle.c | 74 +++++++++++++++++++++++++++++-----------------------------------
 1 file changed, 34 insertions(+), 40 deletions(-)
-------------------------------------------------------------------------------
commit 85beb1d0cccc607802d46af01ab3bae2f695f18f
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-05-02 16:10:13 +0200

    add preliminary functionality & ubus method for setting APN

Base directory -> /
 dongle.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 68 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------
commit 2a6dd7c10342831238ad9b123824be10a8714601
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-05-02 12:12:19 +0200

    Merge branch 'jakob' of private.inteno.se:iopsys-onboarding into HEAD

Base directory -> /
 dongle.c | 1 +
 1 file changed, 1 insertion(+)
-------------------------------------------------------------------------------
commit 28356f4b967693740071e99af1592429073dfb8a
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-05-02 12:11:54 +0200

    add referer to dongle

Base directory -> /
 dongle.c | 1 +
 1 file changed, 1 insertion(+)
-------------------------------------------------------------------------------
2018-05-04 09:17:53 +02:00
Jakob Olsson
9d1540df1d accomodate for splitting dongle file into several 2018-05-04 09:12:04 +02:00
Jakob Olsson
547a955cfe Update feed [ feed_inteno_packages ] package [ onboardingd ]
-------------------------------------------------------------------------------
* 33af504 change from verbose to loglevel, from -v to -l
-------------------------------------------------------------------------------
commit 33af50474ee9f9ef9b7fdf80f43de31f69bd6014
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-30 12:52:12 +0200

    change from verbose to loglevel, from -v to -l

Base directory -> /
 parse_args.c | 8 ++++----
 parser.c     | 2 +-
 watcher.c    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
-------------------------------------------------------------------------------
2018-04-30 12:52:54 +02:00
Jakob Olsson
4f9594a6d1 change verbose to loglevel for all files 2018-04-30 12:32:31 +02:00
Jakob Olsson
86487e8c23 add object from bash script, status and set_configurations available 2018-04-30 12:26:27 +02:00
Jakob Olsson
0caad1b5c7 publishes and prints status 2018-04-30 11:50:54 +02:00
Jakob Olsson
101224dd31 Update feed [ feed_inteno_packages ] package [ onboardingd ]
-------------------------------------------------------------------------------
* 7424f4a fix restart and update configurations from publishing event, other minor fixes
* 8d9286f typo
* b774f37 fix some compile errors
* 3ff8fa6 some name scheme changes, send new flags by event
* 77a2cb7 fix receiving events - listener required to be global or static
* d7e3c62 parser crash crash when receive event
* 825e628 add listener for events
* 6674802 consistent header and c declarations
* b322927 add send event method
* d9266c7 documentation addition, style change
*   3be1f4f fix merge conflicts
|\
| * 88e8a18 fix regarding error handling
| * 229f367 change if-case in check_for_change to prevent multiple printouts on restart, minor style and error handling fixes
| * 15ecc8d changes according to cppcheck, add some error handling in watcher
| * b3d0151 fix to compile - plenty warnings and not tested with cppcheck
| * 3c19c3c small style changes and makefile fix
| * 260bc4a error handling and general style changes -untested!
| * 7242c3c initial changes, test if limits.h is correct
* | 18366b5 add documentation
|/
* f12fdbb minor fixes
* 6aa5b34 some stylistic changes - untested
* caf59c5 print dongle response on ubus, minor style fixes
* 287a85a add struct to keep track of len instead, as in libcurl example
* a2fe80d unfinished, print garbage + response
-------------------------------------------------------------------------------
commit 7424f4adcaac30925ca7f36f78e90136af8be8fa
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-27 13:20:36 +0200

    fix restart and update configurations from publishing event, other minor
    fixes

Base directory -> /
 parser.c  | 10 ++++++----
 watcher.c | 43 +++++++++++++++++++++++--------------------
 watcher.h |  1 +
 3 files changed, 30 insertions(+), 24 deletions(-)
-------------------------------------------------------------------------------
commit 8d9286ff4bb421a21dbe5d945b5f1867068343e4
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-27 09:11:26 +0200

    typo

Base directory -> /
 watcher.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
-------------------------------------------------------------------------------
commit b774f37a70134158290bbcc389166d6b884dafef
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-27 09:03:57 +0200

    fix some compile errors

Base directory -> /
 watcher.c | 34 ++++++++++------------------------
 1 file changed, 10 insertions(+), 24 deletions(-)
-------------------------------------------------------------------------------
commit 3ff8fa611ce6541cbefa0d72b86bd403a941aa61
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-27 08:52:20 +0200

    some name scheme changes, send new flags by event

Base directory -> /
 parser.c  | 30 +++++++++++++-----------------
 watcher.c | 61 ++++++++++++++++++++++++++++++++++++++++---------------------
 2 files changed, 53 insertions(+), 38 deletions(-)
-------------------------------------------------------------------------------
commit 77a2cb7762a2140a55437377ed9ae779049394f1
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-26 15:56:38 +0200

    fix receiving events - listener required to be global or static

Base directory -> /
 parser.c  | 47 +++++++++++++++++++++++------------------------
 watcher.c |  8 ++++----
 2 files changed, 27 insertions(+), 28 deletions(-)
-------------------------------------------------------------------------------
commit d7e3c6221fb648d6ff4966d8fed078bbb6421b91
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-26 11:25:34 +0200

    parser crash crash when receive event

Base directory -> /
 parser.c | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)
-------------------------------------------------------------------------------
commit 825e6288af7757dda7cb1a229e36b95281fb6f2e
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-26 10:57:28 +0200

    add listener for events

Base directory -> /
 parser.c | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------
commit 6674802533ebd5e86692acde93295d24d648198d
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-26 10:24:25 +0200

    consistent header and c declarations

Base directory -> /
 watcher.c |  5 +++--
 watcher.h | 14 +++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)
-------------------------------------------------------------------------------
commit b322927957e294867eaf16296d5d1253e6e6efe6
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-26 10:17:03 +0200

    add send event method

Base directory -> /
 dongle.c  |  4 ++--
 watcher.c | 21 ++++++++++++++++++---
 2 files changed, 20 insertions(+), 5 deletions(-)
-------------------------------------------------------------------------------
commit d9266c7f4c2af00073cfa35d0dd4552961ff767c
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-26 09:26:08 +0200

    documentation addition, style change

Base directory -> /
 .gitignore |  4 ++++
 parser.c   | 18 +++++++--------
 parser.h   |  2 +-
 watcher.c  | 52 ++++++++++++++++++++++++++---------------
 watcher.h  | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 5 files changed, 123 insertions(+), 31 deletions(-)
-------------------------------------------------------------------------------
commit 3be1f4f09875baaa665389dc34c002303fdf46ba
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-26 08:45:52 +0200

    fix merge conflicts

Base directory -> /
 Makefile     |   6 ++
 common.h     |   6 ++
 dongle.c     |   6 +-
 parse_args.c |  10 +--
 parser.c     | 256 +++++++++++++++++++++++++++++++++++++++++------------------
 parser.h     |  28 +++++--
 watcher.c    | 215 ++++++++++++++++++++++++++++++++-----------------
 watcher.h    |  22 ++++-
 8 files changed, 384 insertions(+), 165 deletions(-)
-------------------------------------------------------------------------------
commit 18366b5fa66e6c9126d583b88a9794a3cbc2fa4c
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-26 08:39:43 +0200

    add documentation

Base directory -> /
 parse_args.h |  7 +++++++
 parser.h     | 33 ++++++++++++++++++++++-----------
 watcher.c    | 26 ++++++--------------------
 watcher.h    | 10 ++++++++--
 4 files changed, 43 insertions(+), 33 deletions(-)
-------------------------------------------------------------------------------
commit 88e8a18867c9dd1ff389a8e0b94e5bae93abd8b1
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-25 11:43:33 +0200

    fix regarding error handling

Base directory -> /
 parser.c  | 78 ++++++++++++++++++++++++++++++++++++++++++++++--------------
 parser.h  |  3 ++-
 watcher.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++-----------------
 watcher.h |  4 ++--
 4 files changed, 123 insertions(+), 43 deletions(-)
-------------------------------------------------------------------------------
commit 229f36701dea502fab841166c18b5a04168f47de
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-25 10:35:05 +0200

    change if-case in check_for_change to prevent multiple printouts on restart,
    minor style and error handling fixes

Base directory -> /
 parser.c  | 18 ++++++++----------
 watcher.c | 26 ++++++++++++++------------
 2 files changed, 22 insertions(+), 22 deletions(-)
-------------------------------------------------------------------------------
commit 15ecc8d0f703b8facf4221bf21693c1387589a50
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-25 09:20:57 +0200

    changes according to cppcheck, add some error handling in watcher

Base directory -> /
 parser.c  |  15 ++-----
 watcher.c | 141 +++++++++++++++++++++++++++++++++++++++-----------------------
 watcher.h |   2 +-
 3 files changed, 94 insertions(+), 64 deletions(-)
-------------------------------------------------------------------------------
commit b3d015126ae1d817c283ab4be0fe5cc89b778526
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-24 16:53:59 +0200

    fix to compile - plenty warnings and not tested with cppcheck

Base directory -> /
 parser.c | 8 ++++----
 parser.h | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)
-------------------------------------------------------------------------------
commit 3c19c3c30148fa995c84fb6fbdee0aa903035461
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-24 16:43:35 +0200

    small style changes and makefile fix

Base directory -> /
 Makefile     |  4 ++--
 dongle.c     |  6 +++---
 parse_args.c | 10 ++++------
 parser.c     |  9 ++++-----
 4 files changed, 13 insertions(+), 16 deletions(-)
-------------------------------------------------------------------------------
commit 260bc4a5bc5e22e29b0352187c8a5682a8c4ad4b
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-24 16:35:20 +0200

    error handling and general style changes -untested!

Base directory -> /
 common.h  |   6 ++
 parser.c  | 197 ++++++++++++++++++++++++++++++++++++++++++++------------------
 parser.h  |   2 +
 watcher.h |   1 +
 4 files changed, 151 insertions(+), 55 deletions(-)
-------------------------------------------------------------------------------
commit 7242c3c2b8537f09ae8e87a17e2690c8f24fe13a
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-24 14:09:42 +0200

    initial changes, test if limits.h is correct

Base directory -> /
 Makefile  |  6 ++++++
 parser.c  | 21 +--------------------
 parser.h  | 16 +++++++++++++++-
 watcher.c | 20 --------------------
 watcher.h | 19 +++++++++++++++++++
 5 files changed, 41 insertions(+), 41 deletions(-)
-------------------------------------------------------------------------------
commit f12fdbb07029cbfa69f7b8976474f88046fb4e2a
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-24 12:09:29 +0200

    minor fixes

Base directory -> /
 parser.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
-------------------------------------------------------------------------------
commit 6aa5b3402ad216f4428f171c390a52d5ed0e8b61
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-24 12:04:39 +0200

    some stylistic changes - untested

Base directory -> /
 dongle.c |  6 +-----
 parser.c | 53 ++++++++++++++++++++++++++++-------------------------
 2 files changed, 29 insertions(+), 30 deletions(-)
-------------------------------------------------------------------------------
commit caf59c521938b8bcc083379015e98b5e0d217f8d
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-24 11:24:17 +0200

    print dongle response on ubus, minor style fixes

Base directory -> /
 Makefile  |   2 +-
 dongle.c  | 102 +++++++++++++++++++++++++++++++++++++++++++++-----------------
 parser.c  |   1 -
 watcher.c |   3 +-
 4 files changed, 77 insertions(+), 31 deletions(-)
-------------------------------------------------------------------------------
commit 287a85a5c2f3762f510e5ce83c658e3ac2c64e61
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-24 10:26:18 +0200

    add struct to keep track of len instead, as in libcurl example

Base directory -> /
 .gitignore |  1 +
 dongle.c   | 39 ++++++++++++++++++++++++++-------------
 2 files changed, 27 insertions(+), 13 deletions(-)
-------------------------------------------------------------------------------
commit a2fe80d5ad7a85ad3301fbce08bce1e003d2a0d1
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-23 16:52:01 +0200

    unfinished, print garbage + response

Base directory -> /
 dongle.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------
2018-04-30 10:29:23 +02:00
Jakob Olsson
7382667fc1 attempt to publish ubus object through script 2018-04-30 10:21:06 +02:00
Jakob Olsson
24e497b471 add dongle binary to makefile 2018-04-26 11:28:02 +02:00
Jakob Olsson
7c2ba26b8c Update feed [ feed_inteno_packages ] package [ onboardingd ]
-------------------------------------------------------------------------------
* 4567e2f minor bug fix
* d00214e some dongle test with curl
* 354a426 small improvement to parsing loglevel flag
* cb71185 consistency change for flags
-------------------------------------------------------------------------------
commit 4567e2f38f3f85222bd44c4810bb9bade824dbca
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-23 15:43:28 +0200

    minor bug fix

Base directory -> /
 dongle.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------
commit d00214e63a827d0731c4b73a402fd7dcc12bf20b
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-23 15:24:12 +0200

    some dongle test with curl

Base directory -> /
 Makefile | 11 ++++++---
 dongle.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+), 3 deletions(-)
-------------------------------------------------------------------------------
commit 354a42605ede034f54243212a455f00d1f8ebbb6
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-23 13:39:46 +0200

    small improvement to parsing loglevel flag

Base directory -> /
 parse_args.c | 9 +++++----
 watcher.c    | 6 +++++-
 2 files changed, 10 insertions(+), 5 deletions(-)
-------------------------------------------------------------------------------
commit cb7118580c39418c23a2248e790d359806c32235
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-23 09:55:19 +0200

    consistency change for flags

Base directory -> /
 .gitignore |  3 +--
 parser.c   | 35 ++++++++++++++++++++---------------
 watcher.c  | 34 ++++++++++++++++++++--------------
 3 files changed, 41 insertions(+), 31 deletions(-)
-------------------------------------------------------------------------------
2018-04-23 15:44:43 +02:00
Jakob Olsson
ccbf01013b test for some dongle 2018-04-23 15:44:23 +02:00
Jakob Olsson
2b4cef1cb4 Update feed [ feed_inteno_packages ] package [ onboardingd ]
-------------------------------------------------------------------------------
* 9b7f1d4 clean some printouts
* 3e3d127 change some loglevel printouts
-------------------------------------------------------------------------------
commit 9b7f1d4e7ceefc205e799cc6fa8d231363c6f48d
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-23 09:31:22 +0200

    clean some printouts

Base directory -> /
 parser.c  |  5 ++---
 watcher.c | 39 ++++++++++++---------------------------
 2 files changed, 14 insertions(+), 30 deletions(-)
-------------------------------------------------------------------------------
commit 3e3d12778eb03315ca6a2554271df9a6cbffbbaf
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-23 09:24:06 +0200

    change some loglevel printouts

Base directory -> /
 parser.c | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)
-------------------------------------------------------------------------------
2018-04-23 09:39:44 +02:00
Jakob Olsson
0674212035 start with loglevel 0 2018-04-23 09:39:01 +02:00
Jakob Olsson
da55d5ef09 Update feed [ feed_inteno_packages ] package [ onboardingd ]
-------------------------------------------------------------------------------
* 27bb443 move bash-scripts to test folder, remove capital files pathes
* 71c8008 move uloop_timeout struct outside restart application, now restarts with correct flags, add files to gitignore
* 58ee177 try to restart parser with execv, unsccessful adding to uloop, crashesh with uloop, does not without
* d242006 kill and replace process with new start flags
-------------------------------------------------------------------------------
commit 27bb443eb1380e142b827c9a413adcddd0e964e5
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-23 08:57:29 +0200

    move bash-scripts to test folder, remove capital files pathes

Base directory -> /
 bash-tests/multiple-addremove.sh | 10 ++++++++++
 bash-tests/nested-array.sh       | 21 +++++++++++++++++++++
 bash-tests/nested-objects.sh     | 19 +++++++++++++++++++
 bash-tests/ssid.sh               | 13 +++++++++++++
 common.h                         |  4 ++--
 multiple-addremove.sh            | 10 ----------
 nested-array.sh                  | 21 ---------------------
 nested-objects.sh                | 19 -------------------
 parse_args.c                     |  4 ++--
 ssid.sh                          | 13 -------------
 10 files changed, 67 insertions(+), 67 deletions(-)
-------------------------------------------------------------------------------
commit 71c80083e3ee35d8ea71fd12e923783a75300f22
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-23 08:33:42 +0200

    move uloop_timeout struct outside restart application, now restarts with
    correct flags, add files to gitignore

Base directory -> /
 .gitignore | 12 +++++++++++-
 parser.c   | 30 ++++++++----------------------
 2 files changed, 19 insertions(+), 23 deletions(-)
-------------------------------------------------------------------------------
commit 58ee1775d3ec4d5c5979687a1262a227d828b83e
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-20 16:01:36 +0200

    try to restart parser with execv, unsccessful adding to uloop, crashesh with
    uloop, does not without

Base directory -> /
 parser.c  | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 watcher.c | 41 ++++++++++++++++++++++++-------------
 2 files changed, 92 insertions(+), 19 deletions(-)
-------------------------------------------------------------------------------
commit d2420069fdda2d38b47ab1d7e06143ad5e05e52f
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-20 11:34:51 +0200

    kill and replace process with new start flags

Base directory -> /
 parser.c  |  5 ++--
 watcher.c | 98 ++++++++++++++++++++++++---------------------------------------
 2 files changed, 39 insertions(+), 64 deletions(-)
-------------------------------------------------------------------------------
2018-04-23 09:11:57 +02:00
Jakob Olsson
fc2d33ec4d remove capitalization 2018-04-23 09:01:49 +02:00
Jakob Olsson
99ac1c3c41 manual hash change 2018-04-19 14:04:56 +02:00
Jakob Olsson
79e09f6627 manual change of hash 2018-04-19 12:05:58 +02:00
Jakob Olsson
fb29645dbe add mosquitto package and adjust Makefile in onboardingd to accomodate 2018-04-19 10:51:40 +02:00
Jakob Olsson
35dee9de2e Update feed [ feed_inteno_packages ] package [ onboardingd ]
-------------------------------------------------------------------------------
* 258865c attempting execv solution that keeps pid
* aba0a7f some style change, documentation and name scheme changes
* f77798f swap functionality of set_configurations from parser to watcher and all corresponding changes
* 66b18db add timeout prior to lookup, small error fixes
* d5ad23f add restart from wtihin application functionality for watcher, some more small error fixes
* dc9a03e correct error printouts for invoking ubus from watcher, also provide preliminary restart functions in order to change paths and loglevel from within applications
* f914252 set buf mem to 0 prior to initializing, invoking ubus calls from separate binary works, however will not invoke after restart
* 9ac0215 add uloop and ubus object to watcher, currently incomplete
* e413469 small fix to make ubus IPC work through invoking ubus call
* b9135c8 attempt at invoking ubus method from outside binary that registers it
* a3001e0 update according to checkpatch errors and added some documentation
* c48bd84 added ubus IPC by system() from watcher
* 4ec1230 correction to parser header for declaration of check_pipe (should rename)
* 8bef035 does not compile -- fix header at monday
* 3227782 small fixes
* 07218dc prepare for ubus ipc, untested
* b02592a can change both arguments from single call to set_configuration with both arguments
* 0b2f4ec cleaned up and can now use same method to change configuration file and loglevel
* 6666a31 change config through UCI c API
* 877a72d add support for path through uci, loglevel timing out
* 3ff7676 delete binary
* dc74ccc forgot to add parser.c, test
* ee27697 add functionality to change configuration file through UCI api
* 4968afd some minor errors
* 24921f6 test stackoverflow code to see uci functionality
* 0cc6235 add return to prevent request timeout
* 5618a04 restart from init.d and add paranthesis
* 1e699fe fixed small errors
-------------------------------------------------------------------------------
commit 258865c880870d87fc90917140ab883e73d9c38a
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-18 11:00:06 +0200

    attempting execv solution that keeps pid

Base directory -> /
 parse_args.c | 12 ++++++-----
 watcher.c    | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 70 insertions(+), 10 deletions(-)
-------------------------------------------------------------------------------
commit aba0a7f0ebf8663f9181c274fde4744e7673bff2
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-18 09:04:39 +0200

    some style change, documentation and name scheme changes

Base directory -> /
 Makefile     | 16 +++++-----
 debug.c      | 50 -------------------------------
 debug.h      |  8 -----
 parse_args.c | 50 +++++++++++++++++++++++++++++++
 parse_args.h |  8 +++++
 parser.c     | 55 +++++++++++++++++-----------------
 parser.h     | 43 ++++++++++++++++++++++++++-
 watcher.c    | 97 ++++++++++++++++--------------------------------------------
 8 files changed, 160 insertions(+), 167 deletions(-)
-------------------------------------------------------------------------------
commit f77798fdb527019b251044c63e01c685e64e4369
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-17 16:54:55 +0200

    swap functionality of set_configurations from parser to watcher and all
    corresponding changes

Base directory -> /
 parser.c  | 234 +++++++++++++-------------------------------------------------
 watcher.c | 136 ++++++++++++++++++++++++++++++++----
 2 files changed, 171 insertions(+), 199 deletions(-)
-------------------------------------------------------------------------------
commit 66b18dbc824259721fb1c628a28367fca1bcee44
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-17 15:39:55 +0200

    add timeout prior to lookup, small error fixes

Base directory -> /
 parser.c  | 2 +-
 watcher.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)
-------------------------------------------------------------------------------
commit d5ad23f9a91b021109082210d35f949ff4423eab
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-17 14:14:47 +0200

    add restart from wtihin application functionality for watcher, some more
    small error fixes

Base directory -> /
 parser.c  |  9 +++++----
 watcher.c | 26 ++++++++++++++++++++------
 2 files changed, 25 insertions(+), 10 deletions(-)
-------------------------------------------------------------------------------
commit dc9a03ea2309acb0a3d8077bf4a67cf42bb95b5f
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-17 13:32:27 +0200

    correct error printouts for invoking ubus from watcher, also provide
    preliminary restart functions in order to change paths and loglevel from
    within applications

Base directory -> /
 parser.c  | 61 +++++++++++++++++++++++++++++++++++++++++++++++++------------
 watcher.c | 41 +++++++++++++++++++++++++++++++----------
 2 files changed, 80 insertions(+), 22 deletions(-)
-------------------------------------------------------------------------------
commit f914252a366c6d253a0ad31ed9ddff11a0c59def
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-17 09:59:18 +0200

    set buf mem to 0 prior to initializing, invoking ubus calls from separate
    binary works, however will not invoke after restart

Base directory -> /
 watcher.c | 58 +++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 21 deletions(-)
-------------------------------------------------------------------------------
commit 9ac0215fa11dd9b5fd89c97dd2e52e0d8d8b5bf5
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-16 16:25:14 +0200

    add uloop and ubus object to watcher, currently incomplete

Base directory -> /
 parser.c  |   2 ++
 watcher.c | 103 +++++++++++++++++++++++++++++++++++++++++---------------------
 watcher.h |  10 ++++--
 3 files changed, 78 insertions(+), 37 deletions(-)
-------------------------------------------------------------------------------
commit e41346923ce263deadbb8c806fa41a876a1b6b70
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-16 14:39:43 +0200

    small fix to make ubus IPC work through invoking ubus call

Base directory -> /
 watcher.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
-------------------------------------------------------------------------------
commit b9135c8eb608d2203f6820fe940609ce24b6dd21
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-16 12:33:31 +0200

    attempt at invoking ubus method from outside binary that registers it

Base directory -> /
 watcher.c | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)
-------------------------------------------------------------------------------
commit a3001e08a77a7a4597628f3a754eb7c30cdb4012
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-16 10:41:04 +0200

    update according to checkpatch errors and added some documentation

Base directory -> /
 parser.c  | 81 ++++++++++++++++++++++++---------------------------------------
 parser.h  | 74 +++++++++++++++++++++++++++++++++++++++++++++++++--------
 watcher.c |  2 +-
 watcher.h |  2 +-
 4 files changed, 97 insertions(+), 62 deletions(-)
-------------------------------------------------------------------------------
commit c48bd844a11904a9cb9d73bffb4041b17a918b30
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-16 09:51:36 +0200

    added ubus IPC by system() from watcher

Base directory -> /
 parser.c  | 45 ++++++++++++++++++++++++++++++---------------
 watcher.c | 24 +++++++++++++-----------
 2 files changed, 43 insertions(+), 26 deletions(-)
-------------------------------------------------------------------------------
commit 4ec1230d5d98dac7a33b37191f2470aeca3cb34f
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-16 08:29:58 +0200

    correction to parser header for declaration of check_pipe (should rename)

Base directory -> /
 parser.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------
commit 8bef0353a661578d5358d315430e632bcb0d958c
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-13 16:53:22 +0200

    does not compile -- fix header at monday

Base directory -> /
 parser.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
-------------------------------------------------------------------------------
commit 3227782da6e164111ab121e875e165f8fe69bca4
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-13 16:49:30 +0200

    small fixes

Base directory -> /
 parser.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
-------------------------------------------------------------------------------
commit 07218dc0e73b500aa586511296c3087153258d1a
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-13 16:47:32 +0200

    prepare for ubus ipc, untested

Base directory -> /
 parser.c | 97 ++++++++++++++++++++++++++++------------------------------------
 1 file changed, 42 insertions(+), 55 deletions(-)
-------------------------------------------------------------------------------
commit b02592a3efac991ca7836bcf365570352f634c34
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-13 15:58:43 +0200

    can change both arguments from single call to set_configuration with both
    arguments

Base directory -> /
 parser.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
-------------------------------------------------------------------------------
commit 0b2f4ecbfe469acc974da9c15aa72afca913851a
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-13 14:49:52 +0200

    cleaned up and can now use same method to change configuration file and
    loglevel

Base directory -> /
 parser.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)
-------------------------------------------------------------------------------
commit 6666a31f3e3fb4045c087a94bd0ac80bcc5b21a9
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-13 14:11:13 +0200

    change config through UCI c API

Base directory -> /
 parser.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
-------------------------------------------------------------------------------
commit 877a72dc5d490578b47ddcd26d114352724a97c4
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-13 11:57:57 +0200

    add support for path through uci, loglevel timing out

Base directory -> /
 parser.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
-------------------------------------------------------------------------------
commit 3ff76761d2dc05061d9d68282cfa93bfbe1e971c
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-13 10:32:43 +0200

    delete binary

Base directory -> /
 parser | Bin 57260 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
-------------------------------------------------------------------------------
commit dc74ccc90b12899a92b34f39314fd489ceeda26b
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-13 10:32:06 +0200

    forgot to add parser.c, test

Base directory -> /
 parser.c | 78 ++++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 46 insertions(+), 32 deletions(-)
-------------------------------------------------------------------------------
commit ee276970030b3a53cc041df0596c32615ce1a2de
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-13 10:26:26 +0200

    add functionality to change configuration file through UCI api

Base directory -> /
 Makefile |   2 +-
 parser   | Bin 0 -> 57260 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
-------------------------------------------------------------------------------
commit 4968afd535bf929c4783cb593ad7d19ba2078b5c
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-12 16:47:49 +0200

    some minor errors

Base directory -> /
 parser.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
-------------------------------------------------------------------------------
commit 24921f64ca06a077fd35018b8e8ccda69e5d9899
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-12 16:35:38 +0200

    test stackoverflow code to see uci functionality

Base directory -> /
 parser.c | 53 +++++++++++++++++++++++++++++++++++++++++++++--------
 parser.h | 42 ++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 85 insertions(+), 10 deletions(-)
-------------------------------------------------------------------------------
commit 0cc623501d20bc7e11e0c441e6ef70d4f78cd2e3
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-12 14:42:47 +0200

    add return to prevent request timeout

Base directory -> /
 parser.c | 2 ++
 1 file changed, 2 insertions(+)
-------------------------------------------------------------------------------
commit 5618a04628e3d1ac147461d0aa1fd39e8c03e84c
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-12 13:57:55 +0200

    restart from init.d and add paranthesis

Base directory -> /
 parser.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------
commit 1e699fe9cc0810470e3445af39ff32d09ce93600
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-12 13:28:04 +0200

    fixed small errors

Base directory -> /
 parser.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
-------------------------------------------------------------------------------
2018-04-18 11:36:24 +02:00
Jakob Olsson
6553804000 change verbose flag to take number 2018-04-18 11:01:11 +02:00
Jakob Olsson
a525ba8db1 Update feed [ feed_inteno_packages ] package [ onboardingd ]
-------------------------------------------------------------------------------
* 7801606 take integer as input for ubus method
* ba0c6fa change set_loglevel to accept int
* f061d83 add null termination to strings prior to strcat, add to publish ubus method to alter loglevel, and some minor typoes
-------------------------------------------------------------------------------
commit 7801606c2a529348a08b32e6fc9aaffd324cbe50
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-12 12:08:42 +0200

    take integer as input for ubus method

Base directory -> /
 parser.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------
commit ba0c6fada99fd51b09752753b1fe06d12229c4e9
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-12 10:58:23 +0200

    change set_loglevel to accept int

Base directory -> /
 parser.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
-------------------------------------------------------------------------------
commit f061d8312861c46fcf27ef159dc9bf795aac5e55
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-12 10:49:33 +0200

    add null termination to strings prior to strcat, add to publish ubus method
    to alter loglevel, and some minor typoes

Base directory -> /
 parser.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)
-------------------------------------------------------------------------------
2018-04-12 13:49:55 +02:00
Jakob Olsson
839b785329 Update feed [ feed_inteno_packages ] package [ onboardingd ]
-------------------------------------------------------------------------------
* 3ffa4fd typo
-------------------------------------------------------------------------------
commit 3ffa4fdfe060b15ee21628d5bd3ed2b6563b1018
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-12 10:39:42 +0200

    typo

Base directory -> /
 parser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
-------------------------------------------------------------------------------
2018-04-12 13:49:55 +02:00
Jakob Olsson
dae114b97b add JSON folder to copy to router so dont have to write it manually all the time to test 2018-04-12 13:49:55 +02:00
Jakob Olsson
f6ec7a3f58 Update feed [ feed_inteno_packages ] package [ onboardingd ]
-------------------------------------------------------------------------------
* 36a4757 fix array format
*   e6451c7 Merge branch 'jakob' of private.inteno.se:iopsys-onboarding into jakob
|\
| * 7fe3e74 can send argument and print data
* | 0678b94 add functionality to pass path or verbose argument, alters configuration file and restarts daemon
|/
* 017a6de smaller error fixes
* 3509854 attempt at ubus method with argument
* 6b350fe add table brackets surrounding each element in an array
* c5f9df1 remove test printouts
* 2a72406 open table inside explore object rather than prior
* bca5404 additional printout tests
* 49a7de6 manual blobmsg addition to test print
* 1617af6 should now record empty arrays
* 0b31324 code errors fix
* 6e225cb keep track of current json structure in blobmsg
* 70eb760 ubus method call and application now both work, small bug fix and small code readability improvement.
* 58a34ac additional confusion regarding file path and pipe fixes
* 001926b mixed up file path and pipe path
* 1523a26 fix minor typoes and errors
* 8a3837e move main, add uloop
* 5c68335 additional test.
* 353fd54 print dummy info to ubus onboarding.parser status
* 17a77e5 missed to change name and add context, publish objects works
* c76006c corrected to ubus_add_object...
*   9216101 attempt to publish ubus objects
|\
| * 74c5b96 minor trivial fixes to watcher, parser & makefile. Does not publish ubus objects.
* b43931b attempt to publish ubus object
-------------------------------------------------------------------------------
commit 36a47571c015cb4e5c8b778f2e6d27f2343260e8
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-12 09:21:33 +0200

    fix array format

Base directory -> /
 parser.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------
commit e6451c7c6cfc7d263c2830be64d19c6852482975
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-12 09:17:42 +0200

    Merge branch 'jakob' of private.inteno.se:iopsys-onboarding into jakob

Base directory -> /
 parser.c | 2 ++
 1 file changed, 2 insertions(+)
-------------------------------------------------------------------------------
commit 0678b945d6d2d72216627d7c43646a208140fdfb
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-12 09:16:08 +0200

    add functionality to pass path or verbose argument, alters configuration
    file and restarts daemon

Base directory -> /
 parser.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------
 parser.h |  4 ++--
 2 files changed, 50 insertions(+), 8 deletions(-)
-------------------------------------------------------------------------------
commit 7fe3e743a2b181ea9227efcfb98a1c7f58f3d480
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-11 16:49:54 +0200

    can send argument and print data

Base directory -> /
 parser.c | 2 ++
 1 file changed, 2 insertions(+)
-------------------------------------------------------------------------------
commit 017a6de37338fcfd9c4e6d8f3a20c44f47b14322
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-11 16:19:59 +0200

    smaller error fixes

Base directory -> /
 parser.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)
-------------------------------------------------------------------------------
commit 350985405f9561ff5ec7ed0396babe5b5a2a233a
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-11 16:13:43 +0200

    attempt at ubus method with argument

Base directory -> /
 parser.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 61 insertions(+), 11 deletions(-)
-------------------------------------------------------------------------------
commit 6b350feff33782b29a5b49956d211dcf3990bed9
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-11 13:39:44 +0200

    add table brackets surrounding each element in an array

Base directory -> /
 parser.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
-------------------------------------------------------------------------------
commit c5f9df159ade9619b25829857929d71291720410
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-11 13:24:13 +0200

    remove test printouts

Base directory -> /
 parser.c | 37 +------------------------------------
 parser.h |  1 +
 2 files changed, 2 insertions(+), 36 deletions(-)
-------------------------------------------------------------------------------
commit 2a72406c8aecfdb7d5ce83320d94ab108806ae61
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-11 13:10:06 +0200

    open table inside explore object rather than prior

Base directory -> /
 parser.c | 52 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 23 deletions(-)
-------------------------------------------------------------------------------
commit bca54040f1faa6a795194ac8c8f7303e381a24a4
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-11 11:30:12 +0200

    additional printout tests

Base directory -> /
 parser.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
-------------------------------------------------------------------------------
commit 49a7de6e7bc854072f877469e103a86c6dd2563c
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-11 11:14:16 +0200

    manual blobmsg addition to test print

Base directory -> /
 parser.c | 31 +++++++++++++++++--------------
 parser.h |  2 +-
 2 files changed, 18 insertions(+), 15 deletions(-)
-------------------------------------------------------------------------------
commit 1617af6cde6ea57a635ba31258093c1a70464a54
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-11 10:48:40 +0200

    should now record empty arrays

Base directory -> /
 parser.c | 26 ++++++++++++++------------
 parser.h |  1 +
 2 files changed, 15 insertions(+), 12 deletions(-)
-------------------------------------------------------------------------------
commit 0b31324d9a2be85b00757cde2ec5b0a7d4e504a2
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-11 09:39:47 +0200

    code errors fix

Base directory -> /
 parser.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
-------------------------------------------------------------------------------
commit 6e225cb6c62da2987925c2da59408b3fc67b1278
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-11 09:36:11 +0200

    keep track of current json structure in blobmsg

Base directory -> /
 parser.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)
-------------------------------------------------------------------------------
commit 70eb760c7e2492e1a133519617a7c2952d547234
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-11 09:17:01 +0200

    ubus method call and application now both work, small bug fix and small code
    readability improvement.

Base directory -> /
 parser.c  | 65 ++++++++++++++++++++++++++++++---------------------------------
 watcher.h |  4 ++--
 2 files changed, 33 insertions(+), 36 deletions(-)
-------------------------------------------------------------------------------
commit 58a34ac88530330de97df1e256da00fb8b65b6ce
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-11 08:40:19 +0200

    additional confusion regarding file path and pipe fixes

Base directory -> /
 watcher.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
-------------------------------------------------------------------------------
commit 001926b0cc8e0648df60fa5c4ed372bec0e42707
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-11 08:29:34 +0200

    mixed up file path and pipe path

Base directory -> /
 watcher.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
-------------------------------------------------------------------------------
commit 1523a26640a5db09e78c042403ec3738006c99ab
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-10 16:50:32 +0200

    fix minor typoes and errors

Base directory -> /
 parser.c  | 9 +++++----
 parser.h  | 3 +++
 watcher.c | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)
-------------------------------------------------------------------------------
commit 8a3837ec132c9c4bf850f046057e1c93c44d6fb3
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-10 16:43:57 +0200

    move main, add uloop

Base directory -> /
 parser.c | 127 ++++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 77 insertions(+), 50 deletions(-)
-------------------------------------------------------------------------------
commit 5c68335f6fa4a5e0015756e2f174415545af778f
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-10 13:49:12 +0200

    additional test.

Base directory -> /
 parser.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
-------------------------------------------------------------------------------
commit 353fd547584c58316b475e2b00297ffc63dce1b8
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-10 12:27:22 +0200

    print dummy info to ubus onboarding.parser status

Base directory -> /
 parser.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)
-------------------------------------------------------------------------------
commit 17a77e56d7a7a4200917cb7b4ad17c60d20e2665
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-10 11:07:58 +0200

    missed to change name and add context, publish objects works

Base directory -> /
 parser.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
-------------------------------------------------------------------------------
commit c76006c38cb1dbefea92cfab49d84b1bf3a83b17
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-10 10:55:32 +0200

    corrected to ubus_add_object...

Base directory -> /
 parser.c  | 5 ++++-
 watcher.c | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------
commit 921610133314811605955335f91f997d7173a62b
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-10 10:41:48 +0200

    attempt to publish ubus objects

Base directory -> /
 Makefile  | 2 +-
 parser.c  | 4 ++--
 watcher.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
-------------------------------------------------------------------------------
commit b43931b44d94855015c77cb0c309bd6aa6140a47
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-10 09:30:57 +0200

    attempt to publish ubus object

Base directory -> /
 parser.c  | 25 +++++++++++++++++++------
 parser.h  |  8 ++++----
 watcher.c | 25 +++++++++++++++++++------
 watcher.h |  2 +-
 4 files changed, 43 insertions(+), 17 deletions(-)
-------------------------------------------------------------------------------
commit 74c5b96edb5d25d139322d7dfb82978abbe965a2
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-10 08:46:18 +0200

    minor trivial fixes to watcher, parser & makefile. Does not publish ubus
    objects.

Base directory -> /
 Makefile  | 2 +-
 parser.c  | 6 +++---
 watcher.c | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
-------------------------------------------------------------------------------
2018-04-12 13:49:55 +02:00
Jakob Olsson
f8a92990b0 Update feed [ feed_inteno_packages ] package [ onboardingd ]
-------------------------------------------------------------------------------
* e7129e9 add ubus library to makefile
* e6f93e0 publish ubus objects
* fc0af41 changes to style, also accordance to checkpatch
-------------------------------------------------------------------------------
commit e7129e9f5a2145e20f2011e08233471a4c8ce73b
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-09 16:28:32 +0200

    add ubus library to makefile

Base directory -> /
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
-------------------------------------------------------------------------------
commit e6f93e00ae413f5d0b5520397e59b159f958cfba
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-09 15:59:40 +0200

    publish ubus objects

Base directory -> /
 parser.c  | 21 +++++++++++++++++++++
 watcher.c | 21 +++++++++++++++++++++
 2 files changed, 42 insertions(+)
-------------------------------------------------------------------------------
commit fc0af41610d1ad2e10b254b4e641de5b248938a0
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-09 15:37:40 +0200

    changes to style, also accordance to checkpatch

Base directory -> /
 parser.c  | 71 ++++++++++++++++++---------------------------------------------
 parser.h  |  1 +
 watcher.c | 39 ++++++++++++++---------------------
 watcher.h |  4 ++--
 4 files changed, 39 insertions(+), 76 deletions(-)
-------------------------------------------------------------------------------
2018-04-12 13:49:55 +02:00
Jakob Olsson
e7bceaacbb Update feed [ feed_inteno_packages ] package [ onboardingd ]
-------------------------------------------------------------------------------
* e6f93e0 publish ubus objects
* fc0af41 changes to style, also accordance to checkpatch
-------------------------------------------------------------------------------
commit e6f93e00ae413f5d0b5520397e59b159f958cfba
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-09 15:59:40 +0200

    publish ubus objects

Base directory -> /
 parser.c  | 21 +++++++++++++++++++++
 watcher.c | 21 +++++++++++++++++++++
 2 files changed, 42 insertions(+)
-------------------------------------------------------------------------------
commit fc0af41610d1ad2e10b254b4e641de5b248938a0
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-09 15:37:40 +0200

    changes to style, also accordance to checkpatch

Base directory -> /
 parser.c  | 71 ++++++++++++++++++---------------------------------------------
 parser.h  |  1 +
 watcher.c | 39 ++++++++++++++---------------------
 watcher.h |  4 ++--
 4 files changed, 39 insertions(+), 76 deletions(-)
-------------------------------------------------------------------------------
2018-04-12 13:49:55 +02:00
Jakob Olsson
cb2527007b forgot ! on shebang... 2018-04-12 13:49:55 +02:00
Jakob Olsson
6b92fe1d67 new name 2018-04-12 13:49:55 +02:00
Jakob Olsson
64f92411a6 test please dont look 2018-04-12 13:49:55 +02:00
Jakob Olsson
5f29bb8c6a re-add start and stop 2018-04-12 13:49:55 +02:00
Jakob Olsson
82addbb34f minor errors 2018-04-12 13:49:55 +02:00
Jakob Olsson
aad6415b66 change to naming convention 2018-04-12 13:49:55 +02:00
Jakob Olsson
b427c7b75c Update feed [ feed_inteno_packages ] package [ onboardingd ]
-------------------------------------------------------------------------------
* aeca1e5 add blob list.h linked list library
* 1a1ea5b push common.h
* 6ed19ae swap to libubox test... dont look thanks
-------------------------------------------------------------------------------
commit aeca1e5f1385feef723af4955d665f244b75f5cd
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-09 09:50:43 +0200

    add blob list.h linked list library

Base directory -> /
 Makefile |  2 +-
 parser.c | 80 +++++++++++++++++++++++++++++-----------------------------------
 parser.h | 27 ++++++++--------------
 3 files changed, 47 insertions(+), 62 deletions(-)
-------------------------------------------------------------------------------
commit 1a1ea5bdc4033bbf3adbb1991572abdd2fff6f96
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-06 15:37:03 +0200

    push common.h

Base directory -> /
 common.h | 4 ++++
 1 file changed, 4 insertions(+)
-------------------------------------------------------------------------------
commit 6ed19ae13fb39e4b3a38c10b8eee307c46854a0a
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-06 15:35:20 +0200

    swap to libubox test... dont look thanks

Base directory -> /
 Makefile  |   4 +-
 debug.c   |   4 +-
 debug.h   |   2 +-
 parser.c  | 152 +++++++++++++++++++++++++++-----------------------------------
 parser.h  |   4 ++
 watcher.c |  49 ++++++++++----------
 watcher.h |  13 +++---
 7 files changed, 105 insertions(+), 123 deletions(-)
-------------------------------------------------------------------------------
2018-04-12 13:49:55 +02:00
Jakob Olsson
a0afd51889 Update feed [ feed_inteno_packages ] package [ onboardingd ]
-------------------------------------------------------------------------------
* 4c3b4b4 minor bug fix, faulty variable order
* 2195e87 get file path from flag
-------------------------------------------------------------------------------
commit 4c3b4b446c2c244d3dfee0a6fd9a18f97a56bfcf
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-06 10:20:49 +0200

    minor bug fix, faulty variable order

Base directory -> /
 debug.h   | 2 +-
 watcher.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)
-------------------------------------------------------------------------------
commit 2195e87d017b174db3107e9b9d17d1b4520307be
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-06 09:57:33 +0200

    get file path from flag

Base directory -> /
 debug.c  | 65 ++++++++++++++++++++++++++++++++++++----------------------------
 debug.h  |  6 +++++-
 parser.c | 36 +++++++++++------------------------
 parser.h | 16 ++++++++--------
 4 files changed, 61 insertions(+), 62 deletions(-)
-------------------------------------------------------------------------------
2018-04-12 13:49:55 +02:00
Jakob Olsson
c35d6e7db3 add file_path check to init.d script 2018-04-12 13:49:55 +02:00
Jakob Olsson
338465db4c add file path 2018-04-12 13:49:55 +02:00
Jakob Olsson
c4d04e1650 correct config structure 2018-04-12 13:49:55 +02:00
Jakob Olsson
7e0ee31372 config load typo... 2018-04-12 13:49:55 +02:00
Jakob Olsson
65eb95290e correct if cases and minor errors 2018-04-12 13:49:55 +02:00
Jakob Olsson
818c5f19c6 add possibility to stop and start 2018-04-12 13:49:55 +02:00
Jakob Olsson
aeb6c29f32 add configuration, make daemon depend on config for debug options 2018-04-12 13:49:55 +02:00
Jakob Olsson
9e6144f9d6 Update feed [ feed_inteno_packages ] package [ onboardingd ]
-------------------------------------------------------------------------------
* 0f39861 correct json include
-------------------------------------------------------------------------------
commit 0f3986168f978d435c1dc0798ead921c18e913d1
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-05 15:20:50 +0200

    correct json include

Base directory -> /
 parser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
-------------------------------------------------------------------------------
2018-04-12 13:49:55 +02:00
Jakob Olsson
48d8788fba Update feed [ feed_inteno_packages ] package [ onboardingd ]
-------------------------------------------------------------------------------
* 43c64d2 correct watcher in Make
* 66bbf23 add my own debug library to enable --verbose debug
-------------------------------------------------------------------------------
commit 43c64d2ccbd69c8135f975c389bb04ce23ead66c
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-05 15:03:53 +0200

    correct watcher in Make

Base directory -> /
 Makefile | 3 +++
 debug.c  | 1 +
 2 files changed, 4 insertions(+)
-------------------------------------------------------------------------------
commit 66bbf23c9bac0882047f322b02a90f84cfd4a06f
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-05 14:43:41 +0200

    add my own debug library to enable --verbose debug

Base directory -> /
 JSON/APs.json |   6 +--
 Makefile      |  16 ++++---
 debug.c       |  40 ++++++++++++++++
 debug.h       |   4 ++
 parser.c      | 148 ++++++++++++++++++++++++++++++++++++++++------------------
 parser.h      |   5 +-
 watcher.c     |  32 ++++++++-----
 watcher.h     |   2 +-
 8 files changed, 185 insertions(+), 68 deletions(-)
-------------------------------------------------------------------------------
2018-04-12 13:49:55 +02:00
Jakob Olsson
effd2ebb48 Update feed [ feed_inteno_packages ] package [ onboardingd ]
-------------------------------------------------------------------------------
* 7359cac forget to change path...
-------------------------------------------------------------------------------
commit 7359cac711a4f3f0c882381aecf03f8ecefe4d40
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-05 10:28:06 +0200

    forget to change path...

Base directory -> /
 parser.c  | 2 +-
 watcher.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------
2018-04-12 13:49:55 +02:00
Jakob Olsson
e45b093cc5 Update feed [ feed_inteno_packages ] package [ onboardingd ]
-------------------------------------------------------------------------------
* 647ef53 add correct messages and fixed some faulty behaviour (infinitely reading pipe)
-------------------------------------------------------------------------------
commit 647ef53d88bc941dbb0b14855e8ae38d7a4c7fbb
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-05 10:18:02 +0200

    add correct messages and fixed some faulty behaviour (infinitely reading
    pipe)

Base directory -> /
 JSON/APs.json |  2 +-
 parser.c      | 16 ++++++++++------
 watcher.c     | 45 +++++++++++----------------------------------
 watcher.h     |  9 ++++++---
 4 files changed, 28 insertions(+), 44 deletions(-)
-------------------------------------------------------------------------------
2018-04-12 13:49:55 +02:00
Jakob Olsson
bbbf1327c4 Update feed [ feed_inteno_packages ] package [ onboardingd ]
-------------------------------------------------------------------------------
* 1ff31b2 will try again in 30s if file did not exist
-------------------------------------------------------------------------------
commit 1ff31b20be62ff71d8a0697c5655003ed2b795c4
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-05 08:32:55 +0200

    will try again in 30s if file did not exist

Base directory -> /
 watcher.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
-------------------------------------------------------------------------------
2018-04-12 13:49:55 +02:00
Jakob Olsson
f26fd5d994 change to redirect stdout and stderr to logd 2018-04-12 13:49:55 +02:00
Jakob Olsson
10a8938afd add prints to functions - will hopefully solve starting as daemon 2018-04-12 13:49:55 +02:00
Jakob Olsson
b6e0983d92 remove duplicate start service 2018-04-12 13:49:55 +02:00
Jakob Olsson
d7973f4ede Update feed [ feed_inteno_packages ] package [ onboardingd ]
-------------------------------------------------------------------------------
* 500f481 Merge branch 'jakob' of private.inteno.se:iopsys-onboarding into jakob
* 4a05d44 move struct definition to header
-------------------------------------------------------------------------------
commit 500f4815385b8d434d0be997c9a31556025b8d21
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-04 15:53:38 +0200

    Merge branch 'jakob' of private.inteno.se:iopsys-onboarding into jakob

Base directory -> /
 parser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
-------------------------------------------------------------------------------
commit 4a05d44da39640af324321ff42b66c03da9cf431
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-04 15:53:01 +0200

    move struct definition to header

Base directory -> /
 parser.c | 32 +++++++++++++++++---------------
 parser.h | 38 ++++++++++++++++++++++++++------------
 2 files changed, 43 insertions(+), 27 deletions(-)
-------------------------------------------------------------------------------
2018-04-12 13:49:55 +02:00
Jakob Olsson
3dffcf6401 Update feed [ feed_inteno_packages ] package [ onboardingd ]
-------------------------------------------------------------------------------
* 8a35b40 change include to fit openWRT
-------------------------------------------------------------------------------
commit 8a35b40d95f98d6944c98f7dc7be620c5a1fd1f5
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-04 14:43:18 +0200

    change include to fit openWRT

Base directory -> /
 parser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
-------------------------------------------------------------------------------
2018-04-12 13:49:55 +02:00
Jakob Olsson
3dafd0d521 Update feed [ feed_inteno_packages ] package [ onboardingd ]
-------------------------------------------------------------------------------
* fecd251 remove garbage file
* 38bb4ef add gitignore
* 5ae1d88 removed some options
-------------------------------------------------------------------------------
commit fecd251a7b36e03ce809be54b29ce7676bf8f00c
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-04 14:24:34 +0200

    remove garbage file

Base directory -> /
 JSON/.APs.json.swp | Bin 1024 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
-------------------------------------------------------------------------------
commit 38bb4ef90680e494376a06adfdef506182a9f5c7
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-04 14:22:39 +0200

    add gitignore

Base directory -> /
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)
-------------------------------------------------------------------------------
commit 5ae1d88c43c3cc03f940db254637d78196a5429d
Author: Jakob Olsson <jakobols@kth.se>
Date: 2018-04-04 13:57:46 +0200

    removed some options

Base directory -> /
 parser.c  |  4 ++--
 watcher.c | 15 ++-------------
 2 files changed, 4 insertions(+), 15 deletions(-)
-------------------------------------------------------------------------------
2018-04-12 13:49:55 +02:00
Jakob Olsson
6e76de6519 added parser and watcher in procd 2018-04-12 13:49:55 +02:00
Jakob Olsson
6c5e065975 changed hash manually again ?? 2018-04-12 13:49:55 +02:00
Jakob Olsson
f4d2993bac removed some typo error 2018-04-12 13:49:55 +02:00
Jakob Olsson
d3e1350ee4 changed to most recent hash manually 2018-04-12 13:49:55 +02:00
Jakob Olsson
58a8256ee2 makefile changes 2018-04-12 13:49:55 +02:00
Jakob Olsson
09a486f90a hash update manual test 2018-04-12 13:49:55 +02:00
Jakob Olsson
9e55257916 change of hash manually test 2018-04-12 13:49:55 +02:00
Jakob Olsson
4118abd13e correct url for private folder 2018-04-12 13:49:55 +02:00
Jakob Olsson
95e4761eea some changes 2018-04-12 13:49:55 +02:00
Jakob Olsson
59bbfe6bf8 corrections within makefile addresses 2018-04-12 13:49:55 +02:00
Jakob Olsson
03df688e0e first commit 2018-04-12 13:49:55 +02:00
Sukru Senli
93ec60c75c icwmp-4.0-2018-04-09 2018-04-12 11:20:44 +02:00
Kenneth Johansson
91fe77784e iop ssh_sysupgrade: be verbose. 2018-04-10 17:37:43 +02:00
Ke Hu
f52e3a6d43 update uboot inteno version
if we upg uboot, env inteno version should be set
2018-04-09 17:22:17 +02:00
Kenneth Johansson
ad4bdf1cbe u-boot: new version to force update on all boards.
Force the u-boot version to include the actual build time. This is
needed for the "uboot_inteno_version" variable update to work in all
situations.
2018-04-09 16:01:41 +02:00
Erik Horemans
112bcd7856 new ice-client 5.0.3-RC5 2018-04-09 15:11:53 +02:00
Erik Horemans
cdaa3de08e new ice-client 5.0.3-RC2 2018-04-06 17:10:29 +02:00
Sukru Senli
7d9442cbb2 inteno-netmodes: reboot unless reboot is not set to 0 2018-04-05 11:01:05 +02:00
Ionuț-Alex Oprea
c0b299231d iop: build_branch_sysupgrade: do not run sysupgrade if build_branch fails 2018-04-04 17:14:06 +02:00
Sukru Senli
19f6370294 icwmp-4.0-2018-04-04 refs #14555 2018-04-04 11:37:47 +02:00
Sukru Senli
57cc779ebe Update feed [ feed_inteno_packages ] package [ icwmp ]
-------------------------------------------------------------------------------
* 488440a icwmpd.init: uci get notification with -q option
-------------------------------------------------------------------------------
commit 488440ac21a91977afcb05043f97ebd3f493db57
Author: Sukru Senli <sukru.senli@inteno.se>
Date: 2018-03-29 09:58:06 +0200

    icwmpd.init: uci get notification with -q option

Base directory -> /
 init/icwmpd.init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
-------------------------------------------------------------------------------
2018-03-29 09:58:29 +02:00
Sukru Senli
4db612a708 icwmpd: do not send notify for cwmp config change 2018-03-29 09:26:42 +02:00
Sukru Senli
3030e697b4 icwmp-4.0-2018-03-29 2018-03-29 09:11:56 +02:00
Reidar Cederqvist
41d8969cb5 iop: default config: update juci-plugin names to not include inteno ref #14556 2018-03-28 15:56:28 +02:00
Sukru Senli
68a0b57b89 inteno-netmodes: testnet: fix typo 2018-03-27 09:42:27 +02:00
Sukru Senli
dc1b5991ca inteno-netmodes: testnet: direct operstate check error to devnull 2018-03-23 21:48:16 +01:00
Sukru Senli
220d50e5a6 inteno-netmodes: testnet: disable access to wireless only if uplink is wifi wan refs #14531 2018-03-23 21:40:39 +01:00
Sukru Senli
dca064ff86 voice-client: show only the calls with account info in the call log refs #14164 2018-03-21 17:57:59 +01:00
Sukru Senli
1e0ca02fd3 Update feed [ feed_inteno_packages ] package [ rulengd ]
-------------------------------------------------------------------------------
* 99881f3 Removed unnecessary debug message
* f37f28d Fix support for multiple rules on same event
-------------------------------------------------------------------------------
commit 99881f39232154530ac129dc2109d78963017ad1
Author: Matija Amidzic <matija.amidzic@sartura.hr>
Date: 2018-03-20 16:22:26 +0100

    Removed unnecessary debug message

    Signed-off-by: Matija Amidzic <matija.amidzic@sartura.hr>

Base directory -> /
 src/ruleng_ubus.c | 1 -
 1 file changed, 1 deletion(-)
-------------------------------------------------------------------------------
commit f37f28decf08926569a99e55f4c54a3822274f0f
Author: Matija Amidzic <matija.amidzic@sartura.hr>
Date: 2018-03-20 13:47:41 +0100

    Fix support for multiple rules on same event

    Rulengd now executes configured methods for all matched rules

    Signed-off-by: Matija Amidzic <matija.amidzic@sartura.hr>

Base directory -> /
 src/ruleng_ubus.c | 64 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 30 deletions(-)
-------------------------------------------------------------------------------
2018-03-21 15:27:53 +01:00
Sukru Senli
a415627888 icwmp-4.0-2018-03-21 2018-03-21 09:11:49 +01:00
Ke Hu
b59819d1c7 fix public lib
change from git to http
2018-03-19 10:50:28 +01:00
Sukru Senli
2c8aa1b16e inteno-netmodes: adapt netmodes configs to new vlan and dsl config way 2018-03-19 10:16:16 +01:00
Sukru Senli
ed56e666ec Update feed [ feed_inteno_packages ] package [ questd ]
-------------------------------------------------------------------------------
* 11dd6f3 router.wireless: allow getting assoclist for a specific vif
-------------------------------------------------------------------------------
commit 11dd6f37554f87c767560b3d1d4eba2e2a4ed0ef
Author: Sukru Senli <sukru.senli@inteno.se>
Date: 2018-03-17 10:26:33 +0100

    router.wireless: allow getting assoclist for a specific vif

Base directory -> /
 wireless.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------
2018-03-17 10:28:01 +01:00
Sukru Senli
31972f6962 icwmp: add uci-defaults script to set reqopts 2018-03-16 17:11:03 +01:00
Sukru Senli
9124826b25 iup: add uci-default script to set reqopts 2018-03-16 17:06:58 +01:00
Ronny Nilsson
e9011a695d voice-client: Revert part of 6694e1975b
where I removed a bit to much.
2018-03-16 16:31:02 +01:00
Ronny Nilsson
eb827af331 voice-client: Reduce default set of codecs for SIP
peers. We try to have ALAW only everywhere due to
previously there has been unnecessary transcodings
in several places.
2018-03-16 16:28:21 +01:00
Hrvoje Varga
2adaa3ecf3 imonitor: add package
Signed-off-by: Hrvoje Varga <hrvoje.varga@sartura.hr>
2018-03-16 13:42:16 +01:00
Sukru Senli
2ca35674da Update feed [ feed_inteno_packages ] package [ rulengd ]
-------------------------------------------------------------------------------
* 8285c86 Support multiple rules with same event type
* e1f9223 rulengd: update README
-------------------------------------------------------------------------------
commit 8285c86691a9af4d2e4644fffbfc25ff8a09f816
Author: Matija Amidzic <matija.amidzic@sartura.hr>
Date: 2018-03-05 10:40:06 +0100

    Support multiple rules with same event type

    Multiple rules with with same event type will now be matched based on their
    event_data.

    Signed-off-by: Matija Amidzic <matija.amidzic@sartura.hr>

Base directory -> /
 src/ruleng_ubus.c | 53 +++++++++++++++++++++++++----------------------------
 1 file changed, 25 insertions(+), 28 deletions(-)
-------------------------------------------------------------------------------
commit e1f92234c2f278155888c8dce0348c3672ad0ca3
Author: Sukru Senli <sukru.senli@inteno.se>
Date: 2018-02-22 10:52:55 +0100

    rulengd: update README

Base directory -> /
 README | 61 ++++++++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 44 insertions(+), 17 deletions(-)
-------------------------------------------------------------------------------
2018-03-16 13:39:55 +01:00
Sukru Senli
76cb04904f Update feed [ feed_inteno_packages ] package [ icwmp ]
-------------------------------------------------------------------------------
* 532fe17 Ticket refs #14375: ACS shows "TimedOut Error" on performing "GetParameterValues" on SDX810-AP
-------------------------------------------------------------------------------
commit 532fe1757c09ceb058c8bfb841a935bd0a73c66d
Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
Date: 2018-03-15 18:30:22 +0100

    Ticket refs #14375: ACS shows "TimedOut Error" on performing
    "GetParameterValues" on SDX810-AP

Base directory -> /
 dm/dmcommon.c              | 12 +++++---
 dm/dmtree/tr181/bridging.c | 73 ++++++++++++++++++++++++++--------------------
 dm/dmtree/tr181/ethernet.c |  2 ++
 dm/dmtree/tr181/wifi.c     |  7 ++++-
 4 files changed, 58 insertions(+), 36 deletions(-)
-------------------------------------------------------------------------------
2018-03-16 10:07:21 +01:00
Sukru Senli
7ecbecc9a8 icwmp-4.0-2018-03-15: refs #14390 2018-03-15 16:06:57 +01:00
Sukru Senli
9d18af368d Update feed [ feed_inteno_packages ] package [ icwmp ]
-------------------------------------------------------------------------------
* a1d2dc9 do not reload network if reqopts are not changed
-------------------------------------------------------------------------------
commit a1d2dc97b0f55a1c028012d12d30447f05ab3baa
Author: Sukru Senli <sukru.senli@inteno.se>
Date: 2018-03-15 15:29:33 +0100

    do not reload network if reqopts are not changed

Base directory -> /
 init/icwmpd.init | 2 ++
 1 file changed, 2 insertions(+)
-------------------------------------------------------------------------------
2018-03-15 15:30:00 +01:00
Sukru Senli
2cfea5f582 Revert "icwmp: reload icwmp if new option 43 is received"
This reverts commit b708797e87.
2018-03-14 14:57:22 +01:00
Sukru Senli
6ed3ae9458 icwmp-4.0-2018-03-14 2018-03-14 14:56:09 +01:00
Sukru Senli
b708797e87 icwmp: reload icwmp if new option 43 is received 2018-03-14 14:36:16 +01:00
Ionuț-Alex Oprea
214c9b7e2a iop: ssh_sysupgrade: ssh timeout in 60 seconds 2018-03-14 14:34:03 +01:00
Sukru Senli
6c2c23924d icwmp: reload icwmp when DNS servers are changed as well 2018-03-14 14:13:35 +01:00
Sukru Senli
45034ef8a6 Update feed [ feed_inteno_packages ] package [ icwmp ]
-------------------------------------------------------------------------------
* 02188f6 Ticket refs #13889: Support needed to differentiate WEP 64/128 encryption modes and also the mapping required to set WiFi Key #2 to WiFi Key #4 values from ACS
-------------------------------------------------------------------------------
commit 02188f68caac03e15bad8af98611cc28d856e69f
Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
Date: 2018-03-13 12:20:14 +0100

    Ticket refs #13889: Support needed to differentiate WEP 64/128 encryption
    modes and also the mapping required to set WiFi Key #2 to WiFi Key #4 values
    from ACS

Base directory -> /
 dm/dmtree/tr181/wifi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
-------------------------------------------------------------------------------
2018-03-13 18:55:39 +01:00
Kenneth Johansson
cedf4806e4 generate_tarballs: mediatek linux dir has changed name.
It is only linux-iopsys-ramips now.
2018-03-13 15:29:20 +01:00
Ronny Nilsson
e773632860 endptmngr: Extend signals handling to catch more of them.
Needed for procd reload to work.
2018-03-13 15:19:33 +01:00
Sukru Senli
72344b29b0 inteno-netmodes: limit bridged mode from sdx810-ap 2018-03-13 14:46:34 +01:00
Ronny Nilsson
6694e1975b voice_client: re-enable comment away settings Asterisk no longer need.
It should work now.
This reverts commit b15782bd07.
2018-03-13 11:35:55 +01:00
Kenneth Johansson
2f600a6b58 Revert "samba3: create directories in start script."
This reverts commit 7b1a960d5b.
2018-03-13 11:33:43 +01:00
Ronny Nilsson
aaa473edbf endptmngr: listen for new object events instead of polling 2018-03-13 11:27:43 +01:00
Kenneth Johansson
7b1a960d5b samba3: create directories in start script.
was done in preinit before.
2018-03-12 22:06:42 +01:00
Sukru Senli
336c2b2aa2 Update feed [ feed_inteno_packages ] package [ questd ]
-------------------------------------------------------------------------------
* f900dfd do not arping arponly clients fixes #14416
-------------------------------------------------------------------------------
commit f900dfdb36475d4b2cbd7fb6098c32de2b4b58f5
Author: Sukru Senli <sukru.senli@inteno.se>
Date: 2018-03-12 16:08:27 +0100

    do not arping arponly clients fixes #14416

Base directory -> /
 network.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
-------------------------------------------------------------------------------
2018-03-12 18:18:26 +01:00
Sukru Senli
5664619289 Update feed [ feed_inteno_packages ] package [ icwmp ]
-------------------------------------------------------------------------------
* 110737a Ticket refs #14143: Unable to get wan6 connection in ACS "get parameters" list
* cc552c8 Ticket refs #14137: Unable to retrieve "ErrorsSent", "ErrorsReceived", "DiscardPacketsSent", "DiscardPacketsReceived" parameters for Radios and Ethernet Interfaces via ACS
* 1546cf5 Ticket refs #13884: Enabling "WPA-WPA2-Enterprise" encryption mode via ACS for SSID is not reflected in the RG GUI
* 83d902f Ticket refs #14144: Unable to set "Device.IP.Interface.${i}.IPv4Address.${i}.Enable" parameter from ACS
* ee3096d Ticket refs #13917: Device.Ethernet.Interface.x.Status show always Up even LAN port is not up
-------------------------------------------------------------------------------
commit 110737a3c0f06df26d469608cbd956e26095407e
Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
Date: 2018-03-09 18:41:24 +0100

    Ticket refs #14143: Unable to get wan6 connection in ACS "get parameters"
    list

Base directory -> /
 dm/dmtree/tr181/ip.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
-------------------------------------------------------------------------------
commit cc552c8ef26686e71ae84eb586b62a9d0eba14d9
Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
Date: 2018-03-09 18:36:03 +0100

    Ticket refs #14137: Unable to retrieve "ErrorsSent", "ErrorsReceived",
    "DiscardPacketsSent", "DiscardPacketsReceived" parameters for Radios and
    Ethernet Interfaces via ACS

Base directory -> /
 dm/dmtree/tr181/ethernet.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
 dm/dmtree/tr181/ethernet.h |  4 ++++
 dm/dmtree/tr181/wifi.c     | 41 ++++++++++++++++++++++++++++++++++++++++-
 dm/dmtree/tr181/wifi.h     |  4 ++++
 4 files changed, 92 insertions(+), 1 deletion(-)
-------------------------------------------------------------------------------
commit 1546cf5cbe49590537750f5758a549bac6026689
Author: Omar Kallel <omar.kallel@pivasoftware.com>
Date: 2018-03-09 10:49:34 +0100

    Ticket refs #13884: Enabling "WPA-WPA2-Enterprise" encryption mode via ACS
    for SSID is not reflected in the RG GUI

Base directory -> /
 dm/dmtree/tr181/wifi.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
-------------------------------------------------------------------------------
commit 83d902fdb2d68985dad7ea2f19307326aff68c6f
Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
Date: 2018-03-08 17:49:31 +0100

    Ticket refs #14144: Unable to set
    "Device.IP.Interface.${i}.IPv4Address.${i}.Enable" parameter from ACS

Base directory -> /
 dm/dmtree/tr181/ip.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
-------------------------------------------------------------------------------
commit ee3096d50ca05f19fb377ec1d7496db50c82e9e6
Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
Date: 2018-03-08 17:31:12 +0100

    Ticket refs #13917: Device.Ethernet.Interface.x.Status show always Up even
    LAN port is not up

Base directory -> /
 dm/dmtree/tr181/ethernet.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------
2018-03-12 18:17:45 +01:00
Ke Hu
af0debb6a9 add open to ice and endptmngr
Do not open ice to open
endpt add open definition for  public compiling
add a new function for tarball script to upload endptmngr
2018-03-09 16:13:16 +01:00
Ke Hu
19466fa4a4 add config.in file
endptmng needs open options
2018-03-09 13:08:49 +01:00
Amin Ben Ramdhane
5ea9066e73 Ticket refs #14209: TR-069: add support for compiling both TR-098 and TR-181 support and make it UCI configurable 2018-03-08 16:28:21 +01:00
Ke Hu
55e39205dc upload name issue
kernel name is 502030, but config define is 502003
different name.
2018-03-08 16:18:35 +01:00
Sukru Senli
ad652de055 Update feed [ feed_inteno_packages ] package [ icwmp ]
-------------------------------------------------------------------------------
* a65572a DeviceInfo.VendorLogFile : update instance in dmmap instead of systemwq!
* 6fc82a6 Ticket refs #14388: "Device.WiFi.AccessPoint.x.Enable"  is 0 after factory reset even though the Access points are enabled
* 0c20fe9 Ticket refs #14270: X_IOPSYS_ifname is wrongly populated for wifi clients in Device.Hosts.Host.{i}. profile
* 59261aa Ticket refs #14266: Ethernet Interface Alias parameter to be populated as same interface name
* 79aa835 #14159:TR-069: Vendor logfile in datamodel
* 393b7af Ticket refs #14185: TR069 reboot not working
* 679324f Ticket refs #13818: Not able to Upgrade/downgrade RG using TR069 . Required/Steps for Upgrade procedure
* fe026c3 Ticket refs #14209: TR-069: add support for compiling both TR-098 and TR-181 support and make it UCI configurable
-------------------------------------------------------------------------------
commit a65572af53664945cc6af751c2cbff3a37d64833
Author: Feten Besbes <feten.besbes@pivasoftware.com>
Date: 2018-03-08 11:03:49 +0100

    DeviceInfo.VendorLogFile : update instance in dmmap instead of systemwq!

Base directory -> /
 dm/dmtree/common/deviceinfo.c | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)
-------------------------------------------------------------------------------
commit 6fc82a68e0377a4aaa4a0a7f49c04803a122e4d1
Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
Date: 2018-03-07 13:04:21 +0100

    Ticket refs #14388: "Device.WiFi.AccessPoint.x.Enable"  is 0 after factory
    reset even though the Access points are enabled

Base directory -> /
 dm/dmtree/tr181/wifi.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
-------------------------------------------------------------------------------
commit 0c20fe9560304df4ce29cf67c499062e75f436fa
Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
Date: 2018-03-07 13:02:10 +0100

    Ticket refs #14270: X_IOPSYS_ifname is wrongly populated for wifi clients in
    Device.Hosts.Host.{i}. profile

Base directory -> /
 dm/dmtree/tr181/hosts.c | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)
-------------------------------------------------------------------------------
commit 59261aabea1a8f31af52e5401541584e5743ab22
Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
Date: 2018-03-07 12:39:06 +0100

    Ticket refs #14266: Ethernet Interface Alias parameter to be populated as
    same interface name

Base directory -> /
 dm/dmtree/tr181/ethernet.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
-------------------------------------------------------------------------------
commit 79aa8353d7cc64933fafb1ee69d7991b77b18336
Author: Feten Besbes <feten.besbes@pivasoftware.com>
Date: 2018-03-07 10:07:42 +0100

    #14159:TR-069: Vendor logfile in datamodel

Base directory -> /
 dm/dmtree/common/deviceinfo.c | 63 ++++++++++++++++++++++++++++++++++++++
 dm/dmtree/common/deviceinfo.h |  7 +++++
 scripts/icwmp.sh              | 70 ++++++++++++++++++++++++++++++-------------
 xml.c                         | 26 ++++++++--------
 4 files changed, 131 insertions(+), 35 deletions(-)
-------------------------------------------------------------------------------
commit 393b7af010908ebccb379cc5620656088c37bbc8
Author: Omar Kallel <omar.kallel@pivasoftware.com>
Date: 2018-03-01 14:21:25 +0100

    Ticket refs #14185: TR069 reboot not working

Base directory -> /
 event.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
-------------------------------------------------------------------------------
commit 679324fc33045953adc0ec63265738fc1b2e38ef
Author: Omar Kallel <omar.kallel@pivasoftware.com>
Date: 2018-03-01 11:37:55 +0100

    Ticket refs #13818: Not able to Upgrade/downgrade RG using TR069 .
    Required/Steps for Upgrade procedure

Base directory -> /
 xml.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------
commit fe026c3ffa7623f12d14d4b164c458f3e5c5437c
Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
Date: 2018-03-01 10:41:34 +0100

    Ticket refs #14209: TR-069: add support for compiling both TR-098 and TR-181
    support and make it UCI configurable

Base directory -> /
 bin/Makefile.am                      |   5 +-
 config/cwmp                          |   3 +
 configure.ac                         |  14 ---
 dm/dmcommon.c                        |   9 ++
 dm/dmcommon.h                        |   1 +
 dm/dmcwmp.c                          |   2 +-
 dm/dmcwmp.h                          |  15 ++-
 dm/dmentry.c                         |  75 +++++++++++--
 dm/dmtree/common/root.c              | 200 +++++++++++++++++++++++++----------
 dm/dmtree/common/root.h              |  41 ++++---
 dm/dmtree/common/x_inteno_se_owsd.c  |  40 ++++---
 dm/dmtree/tr098/landevice.c          |  16 +--
 dm/dmtree/tr098/landevice.h          |  14 +--
 dm/dmtree/tr098/layer_2_bridging.c   |  22 ++--
 dm/dmtree/tr098/layer_3_forwarding.c |  25 ++---
 dm/dmtree/tr098/x_inteno_se_wifi.c   |   4 +-
 dm/dmtree/tr098/x_inteno_se_wifi.h   |   4 +-
 dm/dmtree/tr181/bridging.c           |  20 ++--
 dm/dmtree/tr181/bridging.h           |   2 -
 dm/dmtree/tr181/dhcp.c               |   2 +-
 dm/dmtree/tr181/hosts.c              |   4 +-
 dm/dmtree/tr181/ip.c                 |  13 ++-
 dm/dmtree/tr181/nat.c                |   2 +-
 dm/dmtree/tr181/ppp.c                |   8 +-
 dm/dmtree/tr181/routing.c            |  21 ++--
 dm/dmtree/tr181/wan.c                |   6 +-
 dm/dmtree/tr181/wifi.c               |  22 ++--
 dm/dmtree/tr181/wifi.h               |  18 ++--
 event.c                              |   2 +-
 xml.c                                |  12 +--
 30 files changed, 376 insertions(+), 246 deletions(-)
-------------------------------------------------------------------------------
2018-03-08 16:05:04 +01:00
Erik Horemans
56a8f5967d new ice-client 5.0.2-RC15 2018-03-08 16:01:51 +01:00
Reidar Cederqvist
4ee2668013 iop: scripts: update update_feed_branches 2018-03-08 16:01:37 +01:00
Sukru Senli
1c0896dd7b iop: update_feed_branches 2018-03-08 16:01:33 +01:00
Kent Ekholm
dcc55d8564 Update feed [ feed_inteno_packages ] package [ endptmngr ]
-------------------------------------------------------------------------------
* 719be12 Revert "Restart the endptmngr daemon when UCI voice client settings"
-------------------------------------------------------------------------------
commit 719be12028f018e0c1e145082b920e7aefc3c8fa
Author: Kent Ekholm <Kent.Ekholm@evidente.se>
Date: 2018-03-07 17:27:21 +0100

    Revert "Restart the endptmngr daemon when UCI voice client settings"

    This reverts commit 5af57d240649cff2959dc9117d3938447a8f52b7.

    When endptmngr was restarted the endpoint initialisation failed and
    endptmngr eventually crashed on all restart attempts.

Base directory -> /
 files/etc/init.d/endptmngr | 5 -----
 1 file changed, 5 deletions(-)
-------------------------------------------------------------------------------
2018-03-07 18:17:20 +01:00
Kent Ekholm
b15782bd07 Revert "Comment away settings Asterisk no more need. The Endptmngr program"
This reverts commit 460e72f094.

This commit made incoming calls not work beacause no codecs was configured.
2018-03-07 17:24:44 +01:00
Ionut-Alex Oprea
358b1b0af0 inteno-netmodes: flush network cache before getting the ip 2018-03-07 10:56:36 +01:00
Ronny Nilsson
b84dfd06ee endptmngr: Debug print of endpoint names 2018-03-06 18:30:16 +01:00
Ionut-Alex Oprea
3c6042c0f8 iop: build_branch: fix param count 2018-03-06 14:32:02 +01:00
Ionut-Alex Oprea
afea9fc91f iop: build_branch: add more help messages 2018-03-06 14:10:15 +01:00
Ionut-Alex Oprea
7cf104cdd3 iop: add command: build_branch 2018-03-06 13:51:58 +01:00
Ronny Nilsson
7c84202d60 voice_client: remove unused code 2018-03-05 17:06:43 +01:00
Ronny Nilsson
255bb23bcd voice_client: for Asterisk v13 in combination with endptmngr we try
to limit excessive voice transcoding. We use ALAW everywhere internally
and transcode only if it really is necessary.
2018-03-05 17:06:43 +01:00
Ronny Nilsson
094db5b7fa endptmngr: Line signaling didn't work before the first connection
Refs: #14363
2018-03-05 17:06:43 +01:00
Anjan Chanda
7da065dd79 Update feed [ feed_inteno_packages ] package [ questd ]
-------------------------------------------------------------------------------
* 0e50e2b wireless: mediatek: enumerate only AP mode interfaces in load_wireless
-------------------------------------------------------------------------------
commit 0e50e2b81fe1da0b48480e8af2dfc409b2812c11
Author: Anjan Chanda <anjan.chanda@inteno.se>
Date: 2018-03-05 13:59:01 +0100

    wireless: mediatek: enumerate only AP mode interfaces in load_wireless

Base directory -> /
 wireless.c | 3 +++
 1 file changed, 3 insertions(+)
-------------------------------------------------------------------------------
2018-03-05 14:59:21 +01:00
Sukru Senli
5b12b73fa3 inteno-netmodes: fix netmode-discover checking for wifi script running 2018-03-05 13:51:22 +01:00
Sukru Senli
d01308ac9e inteno-netmodes: exclude SDX810-AP board from routed_brcm 2018-03-05 12:00:25 +01:00
Ionut-Alex Oprea
7420bfc587 inteno-netmodes: netmode-discover: prevent busy waiting 2018-03-05 11:14:32 +01:00
Sukru Senli
f9896c5776 Update feed [ feed_inteno_packages ] package [ questd ]
-------------------------------------------------------------------------------
* 3de7c6a use correct path for passwd
-------------------------------------------------------------------------------
commit 3de7c6af6a74a5748d0dea9781931bfbbb178246
Author: Sukru Senli <sukru.senli@inteno.se>
Date: 2018-03-04 11:34:40 +0100

    use correct path for passwd

Base directory -> /
 system.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------
2018-03-04 11:34:54 +01:00
Sukru Senli
17d502dd91 voice-client: if call log is not available return empty array 2018-03-03 11:56:50 +01:00
Ionut-Alex Oprea
992c628bff Update feed [ feed_inteno_packages ] package [ inteno-netmodes ]
-------------------------------------------------------------------------------
* b898924 ubus call netmode sync: make the call reentrant by adding a mutex
* bd47286 add ubus sync method: push credentials to all registered repeaters
-------------------------------------------------------------------------------
commit b898924491c378ca09ab124991b27f54a336e4e9
Author: Ionut-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-03-02 15:34:22 +0100

    ubus call netmode sync: make the call reentrant by adding a mutex

    	if this ubus call is issued twice at the same time,
    only one will do the actual work and the other one will return with
    an error.

    	Can be tested with:
    	while true ; do ubus call netmode sync & done
    Most of the calls will fail
    (Done with return code 9 == UBUS_STATUS_UNKNOWN_ERROR),
    but still the maximum (continuosly) possible will run.

Base directory -> /
 netmoded.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)
-------------------------------------------------------------------------------
commit bd472860ff1fe71ebd066813dcebe8fd99553747
Author: Ionut-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-03-02 14:26:59 +0100

    add ubus sync method: push credentials to all registered repeaters

Base directory -> /
 netmoded.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)
-------------------------------------------------------------------------------
2018-03-02 15:45:11 +01:00
Ionut-Alex Oprea
54214a0918 Update feed [ feed_inteno_packages ] package [ inteno-netmodes ]
-------------------------------------------------------------------------------
* dfc2c63 netmoded: do not compare network for local ifaces refs #14339
-------------------------------------------------------------------------------
commit dfc2c634122f2b2eb9aad12125aa8d08fdf9e20a
Author: Ionut-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-03-01 11:19:07 +0100

    netmoded: do not compare network for local ifaces refs #14339

Base directory -> /
 config.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
-------------------------------------------------------------------------------
2018-03-01 11:46:41 +01:00
Ronny Nilsson
432945e380 voice_client: disable likely unused code 2018-02-27 17:31:05 +01:00
Ronny Nilsson
b118f84ea0 endptmngr: Drop packets if we can't keep up the pace. 2018-02-27 17:31:05 +01:00
Sukru Senli
f0b3e6e381 icwmp: install hotplug script 2018-02-27 15:10:20 +01:00
Sukru Senli
1fd40c307c questd: remove imonitor completely 2018-02-27 14:40:00 +01:00
Sukru Senli
7d32052950 questd: imonitor: do not monitor bsd 2018-02-27 14:33:06 +01:00
Sukru Senli
64a0bdd03e inteno-netmodes: netmode-discover: fping network only if mask is equals or higher than 24 2018-02-27 14:07:38 +01:00
Sukru Senli
8b20543e99 voice-client: adapt to new endpt status output 2018-02-27 14:04:32 +01:00
Sukru Senli
563b810fec icwmp: updated 2018-02-27 13:06:44 +01:00
Sukru Senli
10e699a0c7 iop: select ppp-mod-pppoe 2018-02-27 11:54:05 +01:00
Ronny Nilsson
25fcc515f6 Implement endpoint provisioning, configuration via UCI and
UBUS event when user does something with the phone.
Refs: #13863 #13869 #14123
2018-02-27 11:51:21 +01:00
Sukru Senli
163edf5ed9 Update feed [ feed_inteno_packages ] package [ questd ]
-------------------------------------------------------------------------------
* ad37dc3 mediatek: report rssi in scanresults
-------------------------------------------------------------------------------
commit ad37dc3000cad30702b309be6e339c5a2e16575a
Author: Sukru Senli <sukru.senli@inteno.se>
Date: 2018-02-27 10:24:48 +0100

    mediatek: report rssi in scanresults

Base directory -> /
 mediatek.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------
2018-02-27 10:25:24 +01:00
Sukru Senli
8e9851b3c8 voice-client: show call duration as positive value 2018-02-27 09:39:02 +01:00
Sukru Senli
575d32246f iop: configs: do not deselect miniupnpd for ramips 2018-02-26 21:12:14 +01:00
Sukru Senli
901f0dbf46 voice-client: duration is integer 2018-02-26 18:37:03 +01:00
Sukru Senli
c72b6a0500 voice-client: show duration of calls 2018-02-26 18:36:07 +01:00
Sukru Senli
3129030838 voice-client: support call log 2018-02-26 17:18:19 +01:00
Ronny Nilsson
460e72f094 Comment away settings Asterisk no more need. The Endptmngr program
handles everything low level Broadcom endpoint and reads its settings
directly from UCI.
2018-02-26 16:00:42 +01:00
Sukru Senli
c9c362b9a9 icwmp: fixed compilation error for ramips targets 2018-02-26 15:35:24 +01:00
Sukru Senli
b1e9a4a1e3 icwmp-4.0-2018-02-26 2018-02-26 10:31:12 +01:00
Sukru Senli
faadbfe4a3 voice-client: show line status correctly via ubus 2018-02-25 14:22:31 +01:00
Sukru Senli
47d918b144 voice-client: show only configured sip peers via ubus 2018-02-25 13:47:04 +01:00
Sukru Senli
26611cec75 voice-client: turn of voice led if no sip account is enabled 2018-02-25 13:44:36 +01:00
Sukru Senli
bdc4c121ab icwmp-4.0-2018-02-25 2018-02-25 12:51:02 +01:00
Sukru Senli
dc181b0b75 voice-client: name ubus object voice.asterisk 2018-02-25 12:50:59 +01:00
Sukru Senli
93ae51f1ba voice-client: voice-monitor started on boot 2018-02-25 11:18:31 +01:00
Sukru Senli
7b08997009 voice-client: voice status supports up to 4 sip accounts 2018-02-25 00:07:12 +01:00
Sukru Senli
70339816f7 voice-client: temporary voice ubus object 2018-02-25 00:02:09 +01:00
Sukru Senli
65b3688812 voice-client: updated voice-monitor script 2018-02-24 16:13:23 +01:00
Sukru Senli
37173bd7fb voice-client: initial voice-monitor script 2018-02-24 16:13:23 +01:00
Benjamin Larsson
c46f5444b0 Depend on bcmkernel/bcmopen, dependencies fix 2018-02-22 13:58:30 +01:00
Sukru Senli
a6e56c42a5 inteno-netmodes: testnet: give repeater more time to reconnect to master before retrying 2018-02-21 09:45:59 +01:00
Kenneth Johansson
30e927e3db move config vg50. 2018-02-19 16:28:19 +01:00
Kenneth Johansson
c62103efe3 move config eg300. 2018-02-19 16:25:19 +01:00
Kenneth Johansson
2c26232aac move config dg301al. 2018-02-19 16:17:12 +01:00
Kenneth Johansson
c369409661 move config dg301. 2018-02-19 16:15:17 +01:00
Kenneth Johansson
038f1d361f move config dg200al. 2018-02-19 16:12:56 +01:00
Kenneth Johansson
4f2891ae1e move config dg200. 2018-02-19 16:09:48 +01:00
Kenneth Johansson
b1f98201c1 move config cg300. 2018-02-19 15:42:50 +01:00
Kenneth Johansson
c5bb141696 move config sdx810_rg. 2018-02-19 15:35:13 +01:00
Kenneth Johansson
55b1dc6a1a move config eg400. 2018-02-19 15:30:11 +01:00
Kenneth Johansson
287f3b8c83 move config for dg400prime. 2018-02-19 15:27:14 +01:00
Kenneth Johansson
09fca1ca7e move dg400 config. 2018-02-19 15:20:28 +01:00
Kenneth Johansson
7b0eb9bd81 move config for f104. 2018-02-19 15:07:27 +01:00
Kenneth Johansson
f6b03204dc move config for f104. 2018-02-19 15:04:52 +01:00
Kenneth Johansson
24f0a5e516 Move config from feeds-inteno-targets.
And add support for board specific overrides.
2018-02-19 14:54:54 +01:00
Erik Horemans
cae2fdb421 new ice-client 5.0.2-RC5 2018-02-17 16:11:28 +01:00
Sukru Senli
a2ae74a9d6 Update feed [ feed_inteno_packages ] package [ questd ]
-------------------------------------------------------------------------------
* 319bf11 network: copy only the macaddr to repeated array
-------------------------------------------------------------------------------
commit 319bf11f57e1eb7eb2e8c676def5b15aeec228c1
Author: Sukru Senli <sukru.senli@inteno.se>
Date: 2018-02-17 15:59:03 +0100

    network: copy only the macaddr to repeated array

Base directory -> /
 network.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------
2018-02-17 16:07:52 +01:00
Sukru Senli
d08ce1dfdb inteno-netmodes: netmode-discover: fping wan network only if mask is 24 or less 2018-02-17 16:07:05 +01:00
Kent Ekholm
0e5beb085a Update feed [ feed_inteno_packages ] package [ endptmngr ]
-------------------------------------------------------------------------------
* 8d5d309 Added ubus method to query hook status for a line.
-------------------------------------------------------------------------------
commit 8d5d309e64bcc30ee5612787671c8fcec58b4c26
Author: Kent Ekholm <Kent.Ekholm@evidente.se>
Date: 2018-02-13 19:07:52 +0100

    Added ubus method to query hook status for a line.

    Ref: 14123

Base directory -> /
 src/endpt.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
-------------------------------------------------------------------------------
2018-02-14 12:45:31 +01:00
Reidar Cederqvist
43e9bd1e6f owd: if ipv6 and linklocal is on, listen on ipv6 link local address 2018-02-13 12:04:54 +01:00
Sukru Senli
1897ed4494 Revert "iop: config: select rulengd by default"
This reverts commit 6f4916fa7b.
2018-02-13 11:58:31 +01:00
Kent Ekholm
48c474c99d Update feed [ feed_inteno_packages ] package [ endptmngr ]
-------------------------------------------------------------------------------
* 8178249 Generating offhook and onhook events on ubus path asterisk.endpoint.
-------------------------------------------------------------------------------
commit 8178249f6a40d8a11023e9c9581dd8dbd05364de
Author: Kent Ekholm <Kent.Ekholm@evidente.se>
Date: 2018-02-13 11:00:31 +0100

    Generating offhook and onhook events on ubus path asterisk.endpoint.

    Ref: 14123

Base directory -> /
 src/endpt.c | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
-------------------------------------------------------------------------------
2018-02-13 11:09:09 +01:00
Sukru Senli
6f4916fa7b iop: config: select rulengd by default 2018-02-12 21:57:28 +01:00
Sukru Senli
aa4205e868 icwmp-4.0-2018-02-12 2018-02-12 16:11:33 +01:00
Sukru Senli
febbc8c2ae iop: config: deselect layer2interface 2018-02-10 16:35:18 +01:00
Sukru Senli
722b97d207 layer2interface: removed; its content is moved to Broadcom target 2018-02-10 16:11:03 +01:00
Sukru Senli
35aa491288 owsd: remove redirect from global config 2018-02-10 14:42:06 +01:00
Sukru Senli
84896fcc28 rulend: start with procd 2018-02-10 13:30:26 +01:00
Sukru Senli
e35d1ca5ef rulegd: do not include kernel.mk in the Makefile 2018-02-10 13:20:57 +01:00
Sukru Senli
e2469be380 rulengd: change the example recipe config 2018-02-10 13:18:27 +01:00
Sukru Senli
050187987f rulengd: do not depend on json-c, already depending on libjson-c 2018-02-10 13:16:32 +01:00
Hrvoje Varga
e39fc84722 rulengd: add package
Signed-off-by: Hrvoje Varga <hrvoje.varga@sartura.hr>
2018-02-10 13:03:10 +01:00
Sukru Senli
22b9d0f698 inteno-netmodes: pre-set ifname in wireless configs 2018-02-10 12:19:07 +01:00
Sukru Senli
0bbcc75b1e layer2interface: populate wan ifname with various norhbound interfaces 2018-02-10 12:15:31 +01:00
Benjamin Larsson
ca1d9f7fb8 Update git hash 2018-02-09 16:14:11 +01:00
Sukru Senli
4ccb48f659 Update feed [ feed_inteno_packages ] package [ questd ]
-------------------------------------------------------------------------------
* dcecd25 ignore non-local members of a bridge if last 10 digit of its mac matches the port mac
-------------------------------------------------------------------------------
commit dcecd257d1c369521acd1d47292e501459a81d93
Author: Sukru Senli <sukru.senli@inteno.se>
Date: 2018-02-08 20:36:38 +0100

    ignore non-local members of a bridge if last 10 digit of its mac matches the
    port mac

Base directory -> /
 network.c | 26 +++++++++++++++++++++++++-
 network.h |  1 +
 port.c    |  6 +++++-
 port.h    |  2 +-
 4 files changed, 32 insertions(+), 3 deletions(-)
-------------------------------------------------------------------------------
2018-02-08 20:37:26 +01:00
Sukru Senli
c1e9e80a3f questd: select swconfig and libnl-tiny only for iopsys_ramips target 2018-02-08 15:21:14 +01:00
Sukru Senli
c3daa7416b inteno-netmodes: use correct command to define MTK 2018-02-08 14:34:55 +01:00
Benjamin Larsson
aa36791efd Update feed [ feed_inteno_packages ] package [ u-boot ]
-------------------------------------------------------------------------------
* e6465d2 Rename sdx_500ap -> sdx810_ap
-------------------------------------------------------------------------------
commit e6465d2ad8ac159ada0051d8f30385d9d7d3ba86
Author: Benjamin Larsson <benjamin@southpole.se>
Date: 2018-02-08 12:39:33 +0100

    Rename sdx_500ap -> sdx810_ap

Base directory -> /
 arch/mips/Kconfig               |  16 ++
 board/inteno/sdx810_ap/Kconfig  |  23 ++
 board/inteno/sdx810_ap/Makefile |  10 +
 board/inteno/sdx810_ap/board.c  |   7 +
 configs/sdx810_ap_defconfig     | 511 ++++++++++++++++++++++++++++++++++++++++
 5 files changed, 567 insertions(+)
-------------------------------------------------------------------------------
2018-02-08 12:41:56 +01:00
Sukru Senli
231c76c874 inteno-netmodes: remove SDX from brcm repeater mode 2018-02-08 11:43:18 +01:00
Benjamin Larsson
66e669c06a Rename sdx_500ap -> sdx810_ap 2018-02-08 11:10:07 +01:00
Sukru Senli
b44ec76bd0 icwmp-4.0-2018-02-07 2018-02-07 21:06:32 +01:00
Sukru Senli
6113095ba9 inteno-netmodes: set MTK=1 if kmod-mt*mtk package is installed 2018-02-07 18:55:38 +01:00
Sukru Senli
3475bc4aba port-management: set uplink for wan port by default 2018-02-07 12:02:54 +01:00
Sukru Senli
ae406ee1eb inteno-netmodes: set vid for lan and wan devices for mtk 2018-02-07 11:27:37 +01:00
Sukru Senli
c2b14d454a Update feed [ feed_inteno_packages ] package [ owsd ]
-------------------------------------------------------------------------------
* fa25ad0 owsd now doesn't exit on invalid interface
-------------------------------------------------------------------------------
commit fa25ad0b5af3c9a5c16124a9f699dae3be7b68dd
Author: Matija Amidzic <matija.amidzic@sartura.hr>
Date: 2018-02-05 09:08:38 +0100

    owsd now doesn't exit on invalid interface

    if a non existing interface is provided in the command line arguments, owsd
    will ignore it now and continue working

    Signed-off-by: Matija Amidzic <matija.amidzic@sartura.hr>

Base directory -> /
 src/main.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
-------------------------------------------------------------------------------
2018-02-06 16:47:25 +01:00
Kenneth Johansson
6cb9f9d176 genconfig: Add SDX810-RG board. 2018-02-05 16:57:06 +01:00
Ionut-Alex Oprea
55ece86d76 iop: config: select juci-openvpn package 2018-02-05 16:56:15 +01:00
Kenneth Johansson
cd46d8ea1d uboot: Fix hang. variable is of array type not char.
Boot was hanging.
2018-02-05 15:59:55 +01:00
Reidar Cederqvist
37de7ba685 iop: use openwrt based versions of juci-network plugins 2018-02-05 15:23:51 +01:00
114 changed files with 1676 additions and 1525 deletions

4
endptmngr/Config.in Executable file
View File

@@ -0,0 +1,4 @@
config ENDPT_OPEN
bool "Use pre-compiled version for Open SDK"
default n

View File

@@ -9,31 +9,53 @@ include $(TOPDIR)/rules.mk
PKG_RELEASE:=1
PKG_VERSION:=0.1
PKG_SOURCE_VERSION:=fa9ba5d7c942571ae6e44eb7bb5dae2c9b9e8ca4
ifeq ($(CONFIG_ENDPT_OPEN),y)
BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
PKG_SOURCE:=endptmngr-$(BRCM_KERNEL_PROFILE)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
PKG_NAME:=endptmngr-open
else
PKG_SOURCE_URL:=git@private.inteno.se:endptmngr
PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=e14f741c9c7ecdc6584ce109bed22d3f85a29a16
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_NAME:=endptmngr
endif
RSTRIP:=true
export BUILD_DIR
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
include $(INCLUDE_DIR)/package.mk
define Package/endptmngr/config
source "$(SOURCE)/Config.in"
endef
define Package/endptmngr
CATEGORY:=Utilities
TITLE:=Brcmslic
URL:=
DEPENDS:= +libubox +ubus +libpicoevent
DEPENDS:= +libubox +ubus +libpicoevent +PACKAGE_bcmkernel:bcmkernel +PACKAGE_bcmopen:bcmopen
endef
define Package/endptmngr/description
endptmngr
endef
ifeq ($(CONFIG_ENDPT_OPEN),y)
define Build/Compile
endef
endif
define Package/endptmngr/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_DIR) $(1)/etc/init.d/

View File

@@ -19,14 +19,14 @@ export PLATFORM_INCLUDE:=platforms/iopsys/build.mk
export DATE:=$(shell date +%Y-%m-%d-%H-%M-%S)
export LOGIN:=$(shell whoami)
BASE_PKG_VERSION:=5.0.2
PKG_RELEASE:=RC4
BASE_PKG_VERSION:=5.0.3
PKG_RELEASE:=RC5
PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)_$(DATE)_$(LOGIN)
export PKG_VERSION
###########################--RELEASE--################################
PKG_SOURCE_VERSION:=d7102770d9a7bbd5e926a02391e221d947353544
PKG_SOURCE_VERSION:=a7f40bfd47d0ce3f3c002460e3c83ffc821ac1e4
ifeq ($(CONFIG_ICE_OPEN),y)
TARGET_PROFILE=$(shell echo $(CONFIG_TARGET_BOARD) | sed s/\"//g)
PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
@@ -132,12 +132,12 @@ endef
ifeq ($(CONFIG_ICE_OPEN),y)
define Package/ice-client/install
$(INSTALL_DIR) $(1)/bin
$(INSTALL_DIR) $(1)/etc
$(INSTALL_DIR) $(1)/usr
$(CP) $(PKG_BUILD_DIR)/bin/* $(1)/bin/
$(CP) $(PKG_BUILD_DIR)/etc/* $(1)/etc/
$(CP) $(PKG_BUILD_DIR)/usr/* $(1)/usr/
#$(INSTALL_DIR) $(1)/bin
#$(INSTALL_DIR) $(1)/etc
#$(INSTALL_DIR) $(1)/usr
#$(CP) $(PKG_BUILD_DIR)/bin/* $(1)/bin/
#$(CP) $(PKG_BUILD_DIR)/etc/* $(1)/etc/
#$(CP) $(PKG_BUILD_DIR)/usr/* $(1)/usr/
endef
else
define Package/ice-client/install

View File

@@ -1,14 +1,4 @@
if PACKAGE_libdatamodel
choice
prompt "Select Data Model"
default tr098
config DATAMODEL_TR098
bool "TR-098"
config DATAMODEL_TR181
bool "TR-181"
endchoice
config UPNP_TR064
bool "Compile with tr064 features"

View File

@@ -8,11 +8,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=icwmp
PKG_VERSION:=4.0-2017-12-22
PKG_VERSION:=4.0-2018-04-09
PKG_FIXUP:=autoreconf
PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=30f47f79ef7d21e89a856f444f6f86ab9175d1ed
PKG_SOURCE_VERSION:=cfbec44903f66dc53e2d560d1a4cde42dca923f4
PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -111,9 +111,7 @@ ifeq ($(CONFIG_XMPP_ENABLE),y)
CONFIGURE_ARGS += \
--enable-xmpp
endif
CONFIGURE_ARGS += $(if $(CONFIG_DATAMODEL_TR181),--enable-datamodel=tr181,--enable-datamodel=tr098)
ifeq ($(BUILD_VARIANT),zstream)
CONFIGURE_ARGS += \
--enable-http=zstream \
@@ -169,6 +167,7 @@ ifeq ($(CONFIG_CWMP_SCRIPTS_FULL),y)
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/icwmp.sh $(1)/usr/sbin/icwmp
endif
$(CP) ./files/* $(1)/
endef
define Build/InstallDev

View File

@@ -18,6 +18,8 @@ handle_icwmp_reload() {
mkdir -p /tmp/ipv4
network_flush_cache
local previpaddr=""
local curipaddr=""
local ipaddrfile=/tmp/ipv4/$INTERFACE-ipaddr
@@ -39,7 +41,14 @@ handle_icwmp_reload() {
network_get_subnets cursubnets $INTERFACE
[ -n "$cursubnets" ] && echo $cursubnets > $subnetsfile || rm -f $subnetsfile
[ "$previpaddr" = "$curipaddr" -a "$prevgateway" = "$curgateway" -a "$prevsubnets" = "$cursubnets" ] && exit 0
local prevdnsservers=""
local curdnsservers=""
local dnsserverfile=/tmp/ipv4/$INTERFACE-dnsservers
prevdnsservers=$(cat $dnsserverfile 2>/dev/null)
network_get_dnsserver curdnsservers $INTERFACE
[ -n "$curdnsservers" ] && echo $curdnsservers > $dnsserverfile || rm -f $dnsserverfile
[ "$previpaddr" = "$curipaddr" -a "$prevgateway" = "$curgateway" -a "$prevsubnets" = "$cursubnets" -a "$prevdnsservers" = "$curdnsservers" ] && exit 0
/etc/init.d/icwmpd reload &
}

View File

@@ -0,0 +1,44 @@
#!/bin/sh
. /lib/functions.sh
set_cwmp_reqopts() {
### Ask for DHCP Option 43 only if CWMP is enabled ###
local wan=$(uci -q get cwmp.cpe.default_wan_interface)
local dhcp_discovery=$(uci -q get cwmp.acs.dhcp_discovery)
local discovery=0
case $dhcp_discovery in
enable|1) discovery=1 ;;
esac
local newreqopts=
local baseopts=
local reqopts="$(uci -q get network.$wan.reqopts)"
local proto="$(uci -q get network.$wan.proto)"
local tropts="43"
local oldreqopts="$reqopts"
local ropt iopt
for ropt in $reqopts; do
case $ropt in
43) ;;
*) baseopts="$baseopts $ropt" ;;
esac
done
ropt=""
reqopts="$baseopts $tropts"
for ropt in $reqopts; do
case $ropt in
43) [ $discovery -eq 1 ] && newreqopts="$newreqopts $ropt" ;;
*) newreqopts="$newreqopts $ropt" ;;
esac
done
if [ "$proto" == "dhcp" ]; then
newreqopts="$(echo $newreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
oldreqopts="$(echo $oldreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
[ "$newreqopts" == "$oldreqopts" ] && return
uci -q set network.$wan.reqopts="$newreqopts"
uci commit network
fi
}
set_cwmp_reqopts

42
imonitor/Makefile Normal file
View File

@@ -0,0 +1,42 @@
#
# Copyright (C) 2018 Inteno
#
include $(TOPDIR)/rules.mk
PKG_NAME:=imonitor
PKG_VERSION:=1.0.0
PKG_RELEASE:=1
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
PKG_SOURCE_PROTO=git
PKG_SOURCE_URL:=http://public.inteno.se/imonitor.git
PKG_SOURCE_VERSION:=defec6849fb987619fc7fd9295895f4f0b9db5a9
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
PKG_MAINTAINER:=Sartura Support for Inteno <support-inteno@sartura.hr>
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
define Package/imonitor
CATEGORY:=Utilities
TITLE:=Inteno process supervisor
DEPENDS:=+ubox +uci +ubus +rpcd +rpcd-mod-file
endef
define Package/imonitor/description
imonitor is a process supervisor or a process control system similar to the Supervisor (http://supervisord.org/)
endef
define Package/imonitor/install
$(CP) ./files/* $(1)/
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/imonitor $(1)/usr/bin/
$(INSTALL_DIR) $(1)/etc/config
endef
$(eval $(call BuildPackage,imonitor))

View File

@@ -0,0 +1,8 @@
config monitor
option app 'test'
option test 'echo test'
option stream 'stdout'
option string_match 'test'
option execute 'echo executing'
option interval '10'
option nr_tests '2'

View File

@@ -0,0 +1,29 @@
#!/bin/sh /etc/rc.common
#
# Start the imonitor
#
START=99
STOP=01
USE_PROCD=1
NAME=imonitor
start_service() {
procd_open_instance
procd_set_param command "imonitor"
procd_set_param stdout 1
procd_set_param stderr 1
procd_set_param respawn
procd_close_instance
}
stop() {
service_stop imonitor
}
reload_service() {
stop
start
}

View File

@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=inteno-netmodes
PKG_VERSION:=0.2.0
PKG_SOURCE_VERSION:=f6ad4becd96f9856f900cb9cdbdad730198b24e9
PKG_SOURCE_VERSION:=b898924491c378ca09ab124991b27f54a336e4e9
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=http://public.inteno.se:/netmoded

View File

@@ -6,6 +6,7 @@
. /lib/functions/network.sh
. /lib/functions/netmode.sh
network_flush_cache
network_get_ipaddr ipaddr $INTERFACE
[ -z "$ipaddr" ] && exit

View File

@@ -12,7 +12,7 @@
"CG300",
"CG301",
"EX400",
"SDX*"
"SDX810-AP"
],
"acl" : [
"admin",

View File

@@ -28,10 +28,39 @@ config interface 'iptv'
option proto 'dhcp'
option gateway '0.0.0.0'
option reqopts 'staticroutes'
option ifname 'ptm0.100 atm1.1 $WAN.100 $LAN4'
option ifname 'ptm0.100 $WAN.100 $LAN4'
option defaultroute '0'
config interface 'wan6'
option proto 'dhcpv6'
option ifname '@wan'
config device 'atmwan'
option type 'untagged'
option ifname 'atm0'
option name 'atm0.1'
config device 'ptmwan'
option type 'untagged'
option ifname 'ptm0'
option name 'ptm0.1'
config device 'ethwan'
option type 'untagged'
option ifname '$WAN'
option name '$WAN.1'
config device 'ethtv'
option type '8021q'
option name '$WAN.100'
option ifname '$WAN'
option vid '100'
option priority '0'
config device 'ptmtv'
option type '8021q'
option name 'ptm0.100'
option ifname 'ptm0'
option vid '100'
option priority '0'

View File

@@ -51,6 +51,7 @@ config wifi-iface
option wps_pbc '1'
option wmf_bss_enable '1'
option bss_max '32'
option ifname 'wl0'
config wifi-device 'wl1'
option type 'broadcom'
@@ -90,4 +91,5 @@ config wifi-iface
option wps_pbc '1'
option wmf_bss_enable '1'
option bss_max '32'
option ifname 'wl1'

View File

@@ -13,7 +13,7 @@
"CG301",
"EX400",
"F*",
"SDX*"
"SDX810-AP"
],
"acl" : [
"admin",

View File

@@ -28,7 +28,7 @@ config interface 'iptv'
option proto 'dhcp'
option gateway '0.0.0.0'
option reqopts 'staticroutes'
option ifname 'ptm0.100 atm1.1 $WAN.100 $LAN4'
option ifname 'ptm0.100 $WAN.100 $LAN4'
option defaultroute '0'
config interface 'voip'
@@ -36,10 +36,53 @@ config interface 'voip'
option proto 'dhcp'
option gateway '0.0.0.0'
option reqopts 'staticroutes'
option ifname 'ptm0.200 atm2.1 $WAN.200'
option ifname 'ptm0.200 $WAN.200'
option defaultroute '0'
config interface 'wan6'
option proto 'dhcpv6'
option ifname '@wan'
config device 'atmwan'
option type 'untagged'
option ifname 'atm0'
option name 'atm0.1'
config device 'ptmwan'
option type 'untagged'
option ifname 'ptm0'
option name 'ptm0.1'
config device 'ethwan'
option type 'untagged'
option ifname '$WAN'
option name '$WAN.1'
config device 'ethtv'
option type '8021q'
option name '$WAN.100'
option ifname '$WAN'
option vid '100'
option priority '0'
config device 'ptmtv'
option type '8021q'
option name 'ptm0.100'
option ifname 'ptm0'
option vid '100'
option priority '0'
config device 'ethvoip'
option type '8021q'
option name '$WAN.200'
option ifname '$WAN'
option vid '200'
option priority '0'
config device 'ptmvoip'
option type '8021q'
option name 'ptm0.200'
option ifname 'ptm0'
option vid '200'
option priority '0'

View File

@@ -51,6 +51,7 @@ config wifi-iface
option wps_pbc '1'
option wmf_bss_enable '1'
option bss_max '32'
option ifname 'wl0'
config wifi-device 'wl1'
option type 'broadcom'
@@ -90,4 +91,5 @@ config wifi-iface
option wps_pbc '1'
option wmf_bss_enable '1'
option bss_max '32'
option ifname 'wl1'

View File

@@ -12,6 +12,7 @@
"DG40*",
"EG40*",
"EX40*",
"SDX*",
"F*"
],
"uplink_band" : "b",

View File

@@ -1,6 +0,0 @@
config ethernet_interface 'Wan'
option baseifname '$WAN'
option ifname '$WAN.1'
option name 'WAN'
option bridge '1'

View File

@@ -13,3 +13,8 @@ config interface 'wan'
option ifname '$WAN.1 $LAN1 $LAN2 $LAN3 $LAN4'
option reqopts '43'
config device 'ethwan'
option type 'untagged'
option ifname '$WAN'
option name '$WAN.1'

View File

@@ -51,7 +51,7 @@ config wifi-iface
option wps_pbc '1'
option wmf_bss_enable '1'
option bss_max '32'
option autoconf '1'
option ifname 'wl0'
config wifi-device 'wl1'
option type 'broadcom'
@@ -89,5 +89,5 @@ config wifi-iface
option cipher 'auto'
option wps_pbc '0'
option wmf_bss_enable '1'
option autoconf '1'
option ifname 'wl1'

View File

@@ -12,6 +12,7 @@
"DG40*",
"EG40*",
"EX40*",
"SDX*",
"F*"
],
"uplink_band" : "b",

View File

@@ -1,6 +0,0 @@
config ethernet_interface 'Wan'
option baseifname '$WAN'
option ifname '$WAN.1'
option name 'WAN'
option bridge '1'

View File

@@ -13,3 +13,8 @@ config interface 'wan'
option ifname '$WAN.1 $LAN1 $LAN2 $LAN3 $LAN4'
option reqopts '43'
config device 'ethwan'
option type 'untagged'
option ifname '$WAN'
option name '$WAN.1'

View File

@@ -51,7 +51,7 @@ config wifi-iface
option wps_pbc '1'
option wmf_bss_enable '1'
option bss_max '32'
option autoconf '1'
option ifname 'wl0'
config wifi-device 'wl1'
option type 'broadcom'
@@ -104,5 +104,5 @@ config wifi-iface
option wps_pbc '1'
option wmf_bss_enable '1'
option bss_max '32'
option autoconf '1'
option ifname 'wl1'

View File

@@ -7,6 +7,7 @@ config interface 'loopback'
config device 'lan_dev'
option name 'eth0.1'
option macaddr '$MACLAN'
option vid 1
config interface 'wan'
option type 'bridge'
@@ -19,6 +20,7 @@ config interface 'wan'
config device 'wan_dev'
option name 'eth0.2'
option macaddr '$MACWAN'
option vid 2
config interface 'wan6'
option ifname '@wan'

View File

@@ -7,6 +7,7 @@ config interface 'loopback'
config device 'lan_dev'
option name 'eth0.1'
option macaddr '$MACLAN'
option vid 1
config interface 'wan'
option type 'bridge'
@@ -19,6 +20,7 @@ config interface 'wan'
config device 'wan_dev'
option name 'eth0.2'
option macaddr '$MACWAN'
option vid 2
config interface 'wan6'
option ifname '@wan'

View File

@@ -8,7 +8,8 @@
{ "sv" : "" }
],
"excluded_boards" : [
"EX4*"
"EX4*",
"SDX810-AP"
],
"credentials" : 0
}

View File

@@ -1,13 +0,0 @@
config atm_bridge
option link_type 'EoA'
option encapseoa 'llcsnap_eth'
option unit '0'
option ifname 'atm0.1'
option baseifname 'atm0'
option atmtype 'ubr'
option name 'atm_inet'
option vpi '8'
option vci '35'

View File

@@ -1,5 +0,0 @@
config ethernet_interface 'Wan'
option baseifname '$WAN'
option ifname '$WAN.1'
option name 'WAN'

View File

@@ -1,9 +0,0 @@
config vdsl_interface
option unit '0'
option ifname 'ptm0.1'
option baseifname 'ptm0'
option name 'VDSL2'
option dslat '1'
option ptmprio '1'
option ipqos '1'

View File

@@ -27,3 +27,18 @@ config interface 'wan6'
option proto 'dhcpv6'
option ifname '@wan'
config device 'atmwan'
option type 'untagged'
option ifname 'atm0'
option name 'atm0.1'
config device 'ptmwan'
option type 'untagged'
option ifname 'ptm0'
option name 'ptm0.1'
config device 'ethwan'
option type 'untagged'
option ifname '$WAN'
option name '$WAN.1'

View File

@@ -51,6 +51,7 @@ config wifi-iface
option wps_pbc '1'
option wmf_bss_enable '1'
option bss_max '32'
option ifname 'wl0'
config wifi-device 'wl1'
option type 'broadcom'
@@ -90,4 +91,5 @@ config wifi-iface
option wps_pbc '1'
option wmf_bss_enable '1'
option bss_max '32'
option ifname 'wl1'

View File

@@ -16,6 +16,7 @@ config interface 'lan'
config device 'lan_dev'
option name 'eth0.1'
option macaddr '$MACLAN'
option vid 1
config interface 'wan'
option ifname 'eth0.2'
@@ -27,6 +28,7 @@ config interface 'wan'
config device 'wan_dev'
option name 'eth0.2'
option macaddr '$MACWAN'
option vid 2
config interface 'wan6'
option ifname '@wan'

View File

@@ -27,6 +27,7 @@ config wifi-iface
option encryption psk2
option key $WPAKEY
option wps_pbc 1
option ifname ra0
config wifi-device rai0
option band a
@@ -45,4 +46,5 @@ config wifi-iface
option encryption psk2
option key $WPAKEY
option wps_pbc 1
option ifname rai0

View File

@@ -8,9 +8,8 @@ OLD_MODE_FILE=/var/netmodes/old_mode
SWITCHMODELOCK="/tmp/switching_mode"
MODEDIR=$(uci -q get netmode.setup.dir)
MTK=0
case "$(db -q get hw.board.hardware)" in
EX400|SDX_500AP) MTK=1 ;;
esac
opkg list-installed | grep -q kmod-mt.*mtk && MTK=1
[ -n "$MODEDIR" ] || MODEDIR="/etc/netmodes"
@@ -162,17 +161,13 @@ switch_netmode() {
local reboot=$(uci -q get netmode.$curmode.reboot)
if [ "$reboot" == "1" ]; then
if [ "$reboot" != "0" ]; then
reboot &
exit
fi
/etc/init.d/environment reload
case "$curmode" in
routed*)
[ -f /etc/init.d/layer2 ] && /etc/init.d/layer2 reload
ubus call uci commit '{"config":"network"}'
;;
repeater*)
touch $SWITCHMODELOCK
echo "Switching to $curmode mode" > /dev/console
@@ -187,6 +182,10 @@ switch_netmode() {
ubus call leds set '{"state" : "normal"}'
rm -f $SWITCHMODELOCK
;;
*)
[ -f /etc/init.d/layer2 ] && /etc/init.d/layer2 reload
ubus call uci commit '{"config":"network"}'
;;
esac
}
@@ -402,6 +401,7 @@ start_netmode_tools() {
config_get_bool repeaterready setup repeaterready 0
[ $repeaterready -eq 1 ] && {
/sbin/netmode-discover &
/sbin/wificontrol --repeater &
return
}

View File

@@ -21,9 +21,14 @@ mask_to_cidr() {
}
while true; do
[ -e /sys/class/net/br-wan ] || {
sleep 5
continue
}
unlisted=0
ps | grep -q wifi | grep -q reload || {
ps | grep wifi | grep -q reload || {
for mac in $(brctl showmacs br-wan 2>/dev/null | tail -n +2 | grep no | awk '{print$2}'); do
grep -q "$mac" /proc/net/arp || unlisted=$((unlisted+1))
done
@@ -33,10 +38,10 @@ while true; do
mask=$(mask_to_cidr $netmask)
}
if [ $unlisted -gt 0 -a -n "$ipaddr" -a -n "$netmask" ]; then
if [ $unlisted -gt 0 -a -n "$ipaddr" -a -n "$netmask" -a $mask -ge 24 ]; then
fping -c 1 -t 1000 -g $ipaddr/$mask -q >/dev/null 2>&1
fi
sleep 20
sleep 30
done

View File

@@ -7,6 +7,7 @@ TVCON=0
WANIP=0
LASTSTATUS=""
CURSTATUS=""
ETHWAN="$(db -q get hw.board.ethernetWanPort)"
SLEEP_TIME=30
enableCounter=0
@@ -48,7 +49,7 @@ ping_uplink()
if [ "$hasmode" == "1" ] && [ "$hasip" == "0" -o "$hasdev" == "0" ]; then
rv=0
elif [ "$hasmode" == "1" ]; then
ping $ipaddr -I $device -W 1 -c 1 -q >/dev/null 2>&1
ping $ipaddr -I $device -W 3 -c 1 -q >/dev/null 2>&1
[ $? -eq 1 ] && rv=0 || rv=1
else
SLEEP_TIME=5
@@ -67,7 +68,7 @@ ping_uplink()
if [ $enableCounter -gt 32 ]; then
ubus call led.internet set '{"state" : "error"}'
reboot &
elif [ $((enableCounter % 2)) -eq 0 -a $enableCounter -ge 2 -o $enableCounter -eq 0 ]; then
elif [ $((enableCounter % 8)) -eq 0 -a $enableCounter -ge 8 -o $enableCounter -eq 0 ]; then
ps | grep -v grep | grep -q 'wifi reload\|wifi import\|wifi.credentials\|iwpriv' && return
if [ -f /usr/sbin/wlctl ]; then
@@ -93,13 +94,13 @@ ping_uplink()
iwpriv $wetif set ApCliAutoConnect=1
fi
ubus call led.internet set '{"state" : "notice"}'
touch /tmp/netmodes/repeater_trying_to_connect
else
if [ -f /tmp/netmodes/repeater_trying_to_connect ]; then
rm -f /tmp/netmodes/repeater_trying_to_connect
else
ubus call led.internet set '{"state" : "error"}'
fi
# touch /tmp/netmodes/repeater_trying_to_connect
# else
# if [ -f /tmp/netmodes/repeater_trying_to_connect ]; then
# rm -f /tmp/netmodes/repeater_trying_to_connect
# else
# ubus call led.internet set '{"state" : "error"}'
# fi
fi
enableCounter=$((enableCounter+1))
@@ -110,14 +111,16 @@ ping_uplink()
AccessPolicy=1
if [ -f /usr/sbin/iwpriv ]; then
# Do not allow clients to connect on 2.4GHz radio
iwpriv ra0 set AccessPolicy=$AccessPolicy
# Do not allow clients to connect on 5GHz radio
iwpriv rai0 set AccessPolicy=$AccessPolicy
# Disconnect clients on 2.4GHz radio
iwpriv ra0 set DisConnectAllSta=2
# Disconnect clients on 5GHz radio
iwpriv rai0 set DisConnectAllSta=2
grep -q up /sys/class/net/$ETHWAN/operstate 2>/dev/null || {
# Do not allow clients to connect on 2.4GHz radio
iwpriv ra0 set AccessPolicy=$AccessPolicy
# Do not allow clients to connect on 5GHz radio
iwpriv rai0 set AccessPolicy=$AccessPolicy
# Disconnect clients on 2.4GHz radio
iwpriv ra0 set DisConnectAllSta=2
# Disconnect clients on 5GHz radio
iwpriv rai0 set DisConnectAllSta=2
}
fi
else
echo "{ \"online\" : true }" > /tmp/internet_connection_status
@@ -160,11 +163,10 @@ test_connection() {
}
wan_have_ip() {
[ -d /sys/class/net/$port ] || return
[ -d /sys/class/net/$ETHWAN ] || return
ubus list led.wan >/dev/null 2>&1 || return
local port="$(db -q get hw.board.ethernetWanPort)"
local addr=$(ip a show dev $port | grep "inet "| awk '{print $2}')
local addr=$(ip a show dev $ETHWAN | grep "inet "| awk '{print $2}')
if [ -n "$addr" ]; then
WANIP=1

View File

@@ -43,35 +43,34 @@ CONFIG_PACKAGE_iptables-mod-ipopt=y
CONFIG_PACKAGE_iup=y
CONFIG_PACKAGE_iwatchdog=y
CONFIG_PACKAGE_juci=y
CONFIG_PACKAGE_juci-broadcom-dsl=y
CONFIG_PACKAGE_juci-broadcom-ethernet=y
CONFIG_PACKAGE_juci-broadcom-iptv=y
CONFIG_PACKAGE_juci-broadcom-pwrmgmt=y
CONFIG_PACKAGE_juci-broadcom-vlan=y
CONFIG_PACKAGE_juci-wireless=y
CONFIG_PACKAGE_juci-broadcom-xdsl=y
CONFIG_PACKAGE_juci-ddns=y
CONFIG_PACKAGE_juci-diagnostics=y
CONFIG_PACKAGE_juci-dnsmasq-dhcp=y
CONFIG_PACKAGE_juci-dropbear=y
CONFIG_PACKAGE_juci-ethernet=y
CONFIG_PACKAGE_juci-event=y
CONFIG_PACKAGE_juci-firewall-fw3=y
CONFIG_PACKAGE_juci-ice-client=y
CONFIG_PACKAGE_juci-icwmp=y
CONFIG_PACKAGE_juci-igmpinfo=y
CONFIG_PACKAGE_juci-inteno-backup=y
CONFIG_PACKAGE_juci-config-backup=y
CONFIG_PACKAGE_juci-mwan3=y
CONFIG_PACKAGE_juci-inteno-provisioning=y
# CONFIG_PACKAGE_juci-inteno-qos is not set
CONFIG_PACKAGE_juci-inteno-voice-client=y
CONFIG_PACKAGE_juci-iup=y
# CONFIG_PACKAGE_juci-qos is not set
CONFIG_PACKAGE_juci-voice-client=y
CONFIG_PACKAGE_juci-macdb=y
CONFIG_PACKAGE_juci-minidlna=y
CONFIG_PACKAGE_juci-mod-status=y
CONFIG_PACKAGE_juci-mod-system=y
CONFIG_PACKAGE_juci-natalie-dect=y
CONFIG_PACKAGE_juci-netmode=y
CONFIG_PACKAGE_juci-network-device=y
CONFIG_PACKAGE_juci-network-dsl=y
CONFIG_PACKAGE_juci-network-netifd=y
CONFIG_PACKAGE_juci-network-port=y
CONFIG_PACKAGE_juci-openvpn=y
CONFIG_PACKAGE_juci-owsd=y
CONFIG_PACKAGE_juci-printer=y
CONFIG_PACKAGE_juci-realtime-graphs=y
@@ -87,7 +86,6 @@ CONFIG_PACKAGE_juci-utils=y
# CONFIG_PACKAGE_kmod-ipt-nathelper is not set
CONFIG_PACKAGE_kmod-nls-base=y
CONFIG_PACKAGE_kmod-siit=y
CONFIG_PACKAGE_layer2interface=y
CONFIG_PACKAGE_libcgroup-daemon=y
CONFIG_PACKAGE_libcgroup=y
# CONFIG_PACKAGE_libcgroup-utils is not set
@@ -120,7 +118,7 @@ CONFIG_PACKAGE_peripheral_manager=y
CONFIG_PACKAGE_port-management=y
CONFIG_PACKAGE_power-management=y
CONFIG_PACKAGE_ppp-mod-pppoa=y
# CONFIG_PACKAGE_ppp-mod-pppoe is not set
CONFIG_PACKAGE_ppp-mod-pppoe=y
CONFIG_PACKAGE_ppp-mod-pppol2tp=y
CONFIG_PACKAGE_ppp-mod-pptp=y
CONFIG_PACKAGE_ppp-multilink=y

View File

@@ -0,0 +1,15 @@
# CONFIG_PACKAGE_libcgroup-daemon is not set
# CONFIG_PACKAGE_libcgroup is not set
# CONFIG_PACKAGE_juci-broadcom-wl is not set
# CONFIG_PACKAGE_juci-minisnmpd is not set
# CONFIG_PACKAGE_juci-router-openwrt is not set
# CONFIG_PACKAGE_speedsvc is not set
# CONFIG_juci_broadcom_wl is not set
# CONFIG_juci_minisnmpd is not set
# CONFIG_juci_router_openwrt is not set
# CONFIG_PACKAGE_brcminfo is not set
CONFIG_PACKAGE_brcm_fw_tool=y

View File

@@ -0,0 +1,3 @@
CONFIG_BCM_ENDPOINT_MODULE=y
CONFIG_TARGET_NO_DECT=y

View File

@@ -0,0 +1,3 @@
CONFIG_BCM_ENDPOINT_MODULE=y
CONFIG_TARGET_NO_DECT=y

View File

@@ -0,0 +1,5 @@
CONFIG_BCM_I2C=y
CONFIG_BCM_ENDPOINT_MODULE=y
CONFIG_TARGET_NO_DECT=y
CONFIG_TARGET_NO_DSL=y

View File

@@ -0,0 +1,4 @@
CONFIG_BCM_ENDPOINT_MODULE=y
CONFIG_TARGET_NO_DECT=y
CONFIG_USE_DSL=y
CONFIG_TARGET_DSL_GFAST=y

View File

@@ -0,0 +1,4 @@
CONFIG_BCM_ENDPOINT_MODULE=y
CONFIG_TARGET_NO_DECT=y
CONFIG_USE_DSL=y
CONFIG_TARGET_DSL_GFAST=y

View File

@@ -0,0 +1,3 @@
CONFIG_BCM_ENDPOINT_MODULE=y
CONFIG_TARGET_NO_DECT=y

View File

@@ -0,0 +1,4 @@
CONFIG_TARGET_NO_DSL=y
CONFIG_BCM_I2C=y
CONFIG_BCM_ENDPOINT_MODULE=y

View File

@@ -0,0 +1,16 @@
# CONFIG_PACKAGE_libcgroup-daemon is not set
# CONFIG_PACKAGE_libcgroup is not set
# CONFIG_PACKAGE_natalie-dect is not set
# CONFIG_PACKAGE_juci-broadcom-wl is not set
# CONFIG_PACKAGE_juci-minisnmpd is not set
# CONFIG_PACKAGE_juci-router-openwrt is not set
# CONFIG_PACKAGE_speedsvc is not set
# CONFIG_juci_broadcom_wl is not set
# CONFIG_juci_minisnmpd is not set
# CONFIG_juci_router_openwrt is not set
# CONFIG_PACKAGE_brcminfo is not set
CONFIG_PACKAGE_brcm_fw_tool=y

View File

@@ -0,0 +1,4 @@
CONFIG_BCM_I2C=y
CONFIG_TARGET_NO_DECT=y
CONFIG_BCM_ENDPOINT_MODULE=y

View File

@@ -0,0 +1,3 @@
CONFIG_TARGET_NO_VOICE=y
CONFIG_BCM_I2C=y

View File

@@ -0,0 +1,3 @@
CONFIG_BCM_I2C=y
CONFIG_BCM_ENDPOINT_MODULE=y

View File

@@ -0,0 +1,3 @@
CONFIG_TARGET_NO_VOICE=y
CONFIG_BCM_I2C=y

View File

@@ -0,0 +1,4 @@
CONFIG_TARGET_NO_DSL=y
CONFIG_BCM_I2C=y
CONFIG_BCM_ENDPOINT_MODULE=y

View File

@@ -0,0 +1,5 @@
CONFIG_TARGET_NO_DHD=y
CONFIG_TARGET_NO_VOICE=y
CONFIG_BCM_I2C=y
CONFIG_BCM_ENDPOINT_MODULE=y

View File

@@ -0,0 +1,14 @@
# CONFIG_PACKAGE_libcgroup-daemon is not set
# CONFIG_PACKAGE_libcgroup is not set
# CONFIG_PACKAGE_power-management is not set
# CONFIG_PACKAGE_qos-scripts is not set
# CONFIG_PACKAGE_mtd-utils-deubinize is not set
# CONFIG_PACKAGE_mtd-utils-imagewrite is not set
# CONFIG_PACKAGE_mtd-utils-mkfs.jffs2 is not set
# CONFIG_PACKAGE_mtd-utils-nanddump is not set
CONFIG_PACKAGE_mtd-utils-nandwrite=y
CONFIG_PACKAGE_mtk-bndstrg=y
CONFIG_PACKAGE_omcproxy=y
CONFIG_PACKAGE_kmod-nf-nathelper=y
CONFIG_PACKAGE_kmod-nf-nathelper-extra=y
# CONFIG_PACKAGE_endptmngr is not set

View File

@@ -36,7 +36,7 @@ _iop()
feeds_update genconfig generate_tarballs install_key \
scp_changes setup_host ssh_install_key ssh_sysupgrade \
ssh_sysupgrade_latest ssh_sysupgrade_latest_w status \
update_package"
update_package update_feed_branches"
if [ $COMP_CWORD -eq 1 ] ; then

57
iop/scripts/build_branch.sh Executable file
View File

@@ -0,0 +1,57 @@
#!/bin/sh
# build_branch
#./iop build_branch <branch> <board> [<customer>]
function build_branch_usage {
echo "usage: $0 build_branch <branch> <board> [<customer>]"
echo "example: $0 build_branch devel-new ex400 DEV"
echo "example: $0 build_branch_sysupgrade devel-new ex400 DEV 192.168.1.1 -n"
exit 1
}
function branch_exists {
local branch=$1
[ -z "$branch" ] && return 1
git branch | grep -q $branch && return 0
return 1
}
function build_branch {
local branch=$1
local board=$2
local customer=$3
[ "$customer" == "INT" ] && customer=""
if ! branch_exists $branch ; then
echo "Branch $branch not found"
build_branch_usage
fi
time {
git fetch origin || build_branch_usage
git fetch --all -p || build_branch_usage
git checkout $branch || build_branch_usage
git pull || exit 1
./iop feeds_update || build_branch_usage
./iop genconfig -c $board $customer || build_branch_usage
make -j 8 || build_branch_usage
}
}
function build_branch_sysupgrade {
set -x
local branch=$1 ; shift
local board=$1 ; shift
local customer=$1 ; shift
local ip=$1 ; shift
local opts=$*
time {
./iop build_branch $branch $board $customer
[ "$?" == "0" ] && ./iop ssh_sysupgrade_latest $ip $opts
}
set +x
}
register_command "build_branch" "<branch> <board> [<customer>] Build a <branch> for a <board> [with a <customer> profile]"
register_command "build_branch_sysupgrade" "<branch> <board> <customer>|INT <ip> [<opts>] Build a <branch> for a <board> [with a <customer> profile] and sysupgrade [with <opts>] it on the router at <ip>"

View File

@@ -15,8 +15,8 @@ function genconfig {
LOCAL_MIRROR="http://mirror.inteno.se/mirror"
iopsys_brcm63xx_mips="cg300 cg301 dg150 dg150v2 dg150alv2 dg200 dg200al dg301 dg301al eg300 vg50 vox25 hpc_hu02"
iopsys_brcm63xx_arm="dg400 eg400 f104w f104 dg400prime dg400primeb 963138REF_P502"
iopsys_ramips="ex400 sdx_500ap"
iopsys_brcm63xx_arm="dg400 eg400 sdx810_rg f104w f104 dg400prime dg400primeb 963138REF_P502"
iopsys_ramips="ex400 sdx810_ap"
ramips="mt7621"
target="bogus"
masterconfig=1
@@ -216,11 +216,15 @@ function genconfig {
cp $CONFIGPATH/config .config
fi
# Add target diff
local target_name=$(echo $target | sed 's/_/-/g')
local target_conf=target/linux/${target_name}/config
if [ -f $target_conf ]; then
cat $target_conf >> .config
# Add target (soc/board specific )
if [ -f $CONFIGPATH/target/config ]; then
cat $CONFIGPATH/target/config >> .config
fi
if [ -f $CONFIGPATH/target/$target/config ]; then
cat $CONFIGPATH/target/$target/config >> .config
fi
if [ -f $CONFIGPATH/target/$target/$BOARDTYPE/config ]; then
cat $CONFIGPATH/target/$target/$BOARDTYPE/config >> .config
fi
# Apply profile diff to master config if selected

View File

@@ -4,7 +4,8 @@
build_bcmkernel_consumer() {
local tarfile bcmkernelcommith sdkversion
sdkversion=$(grep "CONFIG_BRCM_SDK_VER.*=y" .config | awk -F'[_,=]' '{print$5}')
bcmkernelcommith=$(grep -w "PKG_SOURCE_VERSION:" $curdir/feeds/feed_inteno_broadcom/bcmkernel/${sdkversion:0:4}*.mk | cut -d'=' -f2)
sdkversion=${sdkversion:0:4}${sdkversion:(-1)}
bcmkernelcommith=$(grep -w "PKG_SOURCE_VERSION:" $curdir/feeds/feed_inteno_broadcom/bcmkernel/${sdkversion:0:5}*.mk | cut -d'=' -f2)
# do not build bcmopen sdk if it was already built before
[ -n "$board" -a -n "$bcmkernelcommith" ] || return
ssh $SERVER "ls $FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz" && return
@@ -36,22 +37,24 @@ build_natalie_consumer() {
cd $curdir
}
build_endptcfg_consumer() {
# create endptcfg open version tar file
build_endptmngr_consumer() {
# create endptmngr open version tar file
local endptversion endptcommith
grep -q "CONFIG_TARGET_NO_VOICE=y" .config && return
endptversion=$(grep -w "PKG_VERSION:" ./feeds/feed_inteno_packages/endptcfg/Makefile | cut -d'=' -f2)
endptcommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/feed_inteno_packages/endptcfg/Makefile | cut -d'=' -f2)
endptversion=$(grep -w "PKG_VERSION:" ./feeds/feed_inteno_packages/endptmngr/Makefile | cut -d'=' -f2)
endptcommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/feed_inteno_packages/endptmngr/Makefile | cut -d'=' -f2)
[ -n "$profile" -a -n "$endptversion" -a -n "$endptcommith" ] || return
ssh $SERVER "ls $FPATH/endptcfg-$profile-$endptversion-$endptcommith.tar.gz" && return
cd ./build_dir/target-*/endptcfg-$endptversion/
mkdir endptcfg-open-$endptversion
cp endptcfg endptcfg-open-$endptversion/
tar -czv endptcfg-open-$endptversion/ -f endptcfg-$profile-$endptversion-$endptcommith.tar.gz
scp endptcfg-$profile-$endptversion-$endptcommith.tar.gz $SERVER:$FPATH/
cp endptcfg-$profile-$endptversion-$endptcommith.tar.gz $curdir/
rm -rf endptcfg-open-$endptversion
rm -f endptcfg-$profile-$endptversion-$endptcommith.tar.gz
ssh $SERVER "ls $FPATH/endptmngr-$profile-$endptversion-$endptcommith.tar.gz" && return
cd ./build_dir/target-*/endptmngr-$endptversion/
mkdir endptmngr-open-$endptversion
mkdir endptmngr-open-$endptversion/src
cp ./src/endptmngr endptmngr-open-$endptversion/src
cp -r ./files/ endptmngr-open-$endptversion/
tar -czv endptmngr-open-$endptversion/ -f endptmngr-$profile-$endptversion-$endptcommith.tar.gz
scp endptmngr-$profile-$endptversion-$endptcommith.tar.gz $SERVER:$FPATH/
cp endptmngr-$profile-$endptversion-$endptcommith.tar.gz $curdir/
rm -rf endptmngr-open-$endptversion
rm -f endptmngr-$profile-$endptversion-$endptcommith.tar.gz
cd $curdir
}
@@ -82,7 +85,7 @@ build_mediatek_kernel() {
ssh $SERVER "ls $FPATH/mediatek-kernel-open-$mediatek_commit.tar.gz" && return
echo "Building mediatek kernel tarball from kernel commit:"
echo $mediatek_commit
cd build_dir/target-mipsel_1004kc*/linux-iopsys-ramips_*/$kernel
cd build_dir/target-mipsel_1004kc*/linux-iopsys-ramips*/$kernel
# Save Kconfig files to recreate the same kernel config,
# delete everyting else.
@@ -144,7 +147,7 @@ function generate_tarballs {
if [ "$stk_target" == "broadcom" ]; then
build_bcmkernel_consumer
build_natalie_consumer
build_endptcfg_consumer
build_endptmngr_consumer
build_ice_consumer
elif [ "$stk_target" == "mediatek" ]; then
build_mediatek_kernel

View File

@@ -22,7 +22,7 @@ function ssh_sysupgrade {
fi
IMAGE=`basename $2`
echo "sysupgrade host: $1 with file $IMAGE"
[ "$2" ] && [ -e "$2" ] && scp $2 root@$1:/tmp/ && ssh root@$1 "sysupgrade $3 /tmp/$IMAGE" && echo "sysupgrade done!"
[ "$2" ] && [ -e "$2" ] && scp $2 root@$1:/tmp/ && ssh -o ConnectTimeout=60 root@$1 "sysupgrade -v $3 /tmp/$IMAGE" && echo "sysupgrade done!"
}
register_command "ssh_sysupgrade" "<host> <file> [opts] Install firmware on remote host with SSH"

View File

@@ -0,0 +1,61 @@
#!/bin/sh
# Exported interface
function update_feed_branches {
local release="$1"
local ipath="$(pwd)"
local branch="$2"
local curbranch
[ -n "$release" ] || {
echo "Usage: ./update_feeds <RELEASE> <BRANCH>"
echo ""
echo "If you do not give a branch as argument,"
echo "<RELEASE> branch will be updated to commit"
echo "hash given in feeds.conf for each feed repo"
exit 1
}
if [ -n "$branch" ]; then
echo "Updating release branch $release to specific commit hash given in feeds.conf for each feed repo at branch $branch"
if git diff-index --quiet HEAD; then
curbranch=`git symbolic-ref HEAD 2>/dev/null`
curbranch=${curbranch##refs/heads/}
if [ -z $curbranch ]; then
curbranch=`git log -1 --pretty=format:"%H"`
fi
git checkout $branch || {
echo "couldn't checkout branch $branch"
exit 99
}
else
echo "You have unsaved changes."
exit 99
fi
else
echo "Updating release branch $release to specific commit hash given in feeds.conf for each feed repo"
fi
ifeeds="$(grep -r feed_inteno feeds.conf | awk '{print$2}' | cut -d'_' -f3 | tr '\n' ' ')"
for f in $ifeeds; do
commith=$(grep feed_inteno_$f feeds.conf | cut -d'^' -f2)
cd $ipath/feeds/feed_inteno_$f
git branch -D $release 2>/dev/null
echo "feed_inteno_$f: updating release branch $release to commit $commith"
git checkout $commith
git push origin :$release
git checkout -b $release
git push origin $release
cd $ipath
done
if [ -n "$branch" ]; then
echo "Release branch $release is updated to specific commit hash given in feeds.conf in in branch $branch for each feed repo"
git checkout $curbranch
else
echo "Release branch $release is updated to specific commit hash given in feeds.conf for each feed repo"
fi
}
register_command "update_feed_branches" "<release> [branch] Update branches in feeds from the current top level commit or specified top level branch"

View File

@@ -0,0 +1,57 @@
#!/bin/sh
. /lib/functions.sh
management_interfaces() {
local DHCP_IFACES=""
is_notbridged_dhcp() {
local config="$1"
local proto="$(uci -q get network.$config.proto)"
local typ="$(uci -q get network.$config.type)"
if [ "$proto" == "dhcp" -a "$typ" != "bridge" ]; then
DHCP_IFACES="$DHCP_IFACES $config"
fi
}
config_load network
config_foreach is_notbridged_dhcp interface
echo $DHCP_IFACES
}
set_iup_reqopts() {
### Ask for IUP related DHCP options only if IUP is enabled ###
new_reqopts() {
local net=$1
local enabled="$(uci -q get provisioning.iup.enabled)"
enabled="${enabled:-on}"
local newreqopts=
local baseopts=
local reqopts="$(uci -q get network.$net.reqopts)"
local iupopts="66 67 128 224 225 226"
local ropt iopt
local net
for ropt in $reqopts; do
case $ropt in
66|67|128|224|225|226) ;;
*) baseopts="$baseopts $ropt" ;;
esac
done
ropt=""
reqopts="$baseopts $iupopts"
for ropt in $reqopts; do
case $ropt in
66|67|128|224|225|226) [ $enabled == "on" ] && newreqopts="$newreqopts $ropt" ;;
*) newreqopts="$newreqopts $ropt" ;;
esac
done
newreqopts="$(echo $newreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
echo "$newreqopts"
}
for net in $(management_interfaces); do
uci -q set network.$net.reqopts="$(new_reqopts $net)"
done
uci commit network
}
set_iup_reqopts

View File

@@ -1,42 +0,0 @@
#
# Copyright (C) 2013 Inteno
#
include $(TOPDIR)/rules.mk
PKG_NAME:=layer2interface
PKG_VERSION:=1.0.0
PKG_RELEASE:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
include $(INCLUDE_DIR)/package.mk
define Package/layer2interface
CATEGORY:=Base system
TITLE:=Tools for setting up layer2 interfaces
endef
define Package/layer2interface/description
layer2interface contains necessary tools to create
layer2 interfaces
endef
define Build/Prepare
mkdir -p $(PKG_BUILD_DIR)
$(CP) ./broadcom/* $(PKG_BUILD_DIR)/
endef
define Build/Compile
endef
ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
define Package/layer2interface/install
$(CP) ./broadcom/* $(1)/
endef
else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
define Package/layer2interface/install
$(CP) ./broadcom/* $(1)/
endef
endif
$(eval $(call BuildPackage,layer2interface))

View File

@@ -1,48 +0,0 @@
# DSL Modes
config dsl-line line
list mode gdmt
list mode glite
list mode t1413
list mode adsl2
list mode adsl2p
list mode annexl
list mode annexm
list mode vdsl2
list mode gfast
list profile 8a
list profile 8b
list profile 8c
list profile 8d
list profile 12a
list profile 12b
list profile 17a
list profile 30a
list profile 35b
option bitswap 1
option sra 1
option trellis
option sesdrop
# VDSL2 only
option us0
option dynamicd
option dynamicf
option sos
config atm-device atm0
option name 'ATM'
option vpi '8'
option vci '35'
option device atm0
option link_type 'eoa' # EoA, IPoA, PPPoA, CIP
option encapsulation 'llc' # llc, vcmux
option qos_class 'ubr' # ubr, cbr, gfr, vbr-nrt, vbr-rt, ubr+, abr
# option pcr '512'
# option scr '256'
# option mbs '1024'
config ptm-device ptm0
option name 'PTM'
option device 'ptm0'
option priority '1'
option portid '1'

View File

@@ -1,26 +0,0 @@
config dsltype 'vdsl'
option 'enabled' 'on'
config dsltype 'adsl'
option 'enabled' 'on'
config dslsettings 'capabilities'
option 'GDmt' 'Enabled'
option 'Glite' 'Enabled'
option 'T1413' 'Enabled'
option 'ADSL2' 'Enabled'
option 'AnnexL' 'Enabled'
option 'ADSL2plus' 'Enabled'
option 'VDSL2' 'Enabled'
option '8a' 'Enabled'
option '8b' 'Enabled'
option '8c' 'Enabled'
option '8d' 'Enabled'
option '12a' 'Enabled'
option '12b' 'Enabled'
option '17a' 'Enabled'
option '30a' 'Enabled'
option 'US0' 'on'
option 'bitswap' 'on'
option 'sra' 'on'

View File

@@ -1,11 +0,0 @@
config atm_bridge
option 'link_type' 'EoA'
option 'encapseoa' 'llcsnap_eth'
option 'unit' '0'
option 'ifname' 'atm0.1'
option 'baseifname' 'atm0'
option 'vpi' '8'
option 'vci' '35'
option 'name' 'DSL8_35'
option 'atmtype' 'ubr'

View File

@@ -1,2 +0,0 @@
config ethernet_interface 'Wan'

View File

@@ -1,9 +0,0 @@
config vdsl_interface
option 'unit' '0'
option 'ifname' 'ptm0.1'
option 'baseifname' 'ptm0'
option 'name' 'VDSL2'
option 'dslat' '1'
option 'ptmprio' '1'
option 'ipqos' '1'

View File

@@ -1,38 +0,0 @@
#
# Ethernet frame types
# This file describes some of the various Ethernet
# protocol types that are used on Ethernet networks.
#
# This list could be found on:
# http://www.iana.org/assignments/ethernet-numbers
#
# <name> <hexnumber> <alias1>...<alias35> #Comment
#
IPv4 0800 ip ip4 # Internet IP (IPv4)
X25 0805
ARP 0806 ether-arp #
FR_ARP 0808 # Frame Relay ARP [RFC1701]
BPQ 08FF # G8BPQ AX.25 Ethernet Packet
DEC 6000 # DEC Assigned proto
DNA_DL 6001 # DEC DNA Dump/Load
DNA_RC 6002 # DEC DNA Remote Console
DNA_RT 6003 # DEC DNA Routing
LAT 6004 # DEC LAT
DIAG 6005 # DEC Diagnostics
CUST 6006 # DEC Customer use
SCA 6007 # DEC Systems Comms Arch
TEB 6558 # Trans Ether Bridging [RFC1701]
RAW_FR 6559 # Raw Frame Relay [RFC1701]
AARP 80F3 # Appletalk AARP
ATALK 809B # Appletalk
802_1Q 8100 8021q 1q 802.1q dot1q # 802.1Q Virtual LAN tagged frame
IPX 8137 # Novell IPX
NetBEUI 8191 # NetBEUI
IPv6 86DD ip6 # IP version 6
PPP 880B # PPP
ATMMPOA 884C # MultiProtocol over ATM
PPP_DISC 8863 # PPPoE discovery messages
PPP_SES 8864 # PPPoE session messages
ATMFATE 8884 # Frame-based ATM Transport over Ethernet
LOOP 9000 loopback # loop proto

View File

@@ -1,2 +0,0 @@
[ "$STATUS" == "up" -o "$STATUS" == "down" ] && /etc/init.d/dsl reload

View File

@@ -1,8 +0,0 @@
if [ "$STATUS" == "up" ]; then
ubus call led.dsl set '{"state":"ok"}'
elif [ "$STATUS" == "down" ]; then
ubus call led.dsl set '{"state":"off"}'
elif [ "$STATUS" == "training" ]; then
ubus call led.dsl set '{"state":"alert"}'
fi

View File

@@ -1,73 +0,0 @@
include /lib/network
# true if speed on interface is Gbit
gigatest() {
local speed=$(ethctl $INTERFACE media-type 2>&1 | awk '{if (NR == 2) print $6}')
case "$speed" in
1000*) return 0 ;;
*) return 1 ;;
esac
}
# true if there is a link on any lan port
lan_test () {
local ledontest
for dev in $(db get hw.board.ethernetLanPorts); do
ledontest=$(cat /sys/class/net/$dev/operstate)
if [ "$ledontest" == "up" ]; then
return 0
fi
done
return 1
}
case "$ACTION" in
add|register)
INTFNAME=$(interfacename $INTERFACE)
OPERSTATE=$(cat /sys/class/net/$INTERFACE/operstate)
# if [ "$OPERSTATE" == "up" ]; then
if true ; then
case "$INTFNAME" in
GbE*)
ubus call led.lan set '{"state" : "ok"}'
ubus call led.gbe set '{"state" : "ok"}'
ubus call led.gbe_phy_link set '{"state" : "ok"}'
ubus call led.gbe_phy_speed set '{"state": "off"}'
$(gigatest) && ubus call led.gbe_phy_speed set '{"state":"ok"}'
;;
LAN*)
ubus call led.lan set '{"state":"ok"}'
;;
WAN*)
ubus call led.wan set '{"state" : "ok"}'
ubus call led.wan_phy_link set '{"state" : "ok"}'
ubus call led.wan_phy_speed set '{"state" : "off"}'
$(gigatest) && ubus call led.wan_phy_speed set '{"state":"ok"}'
;;
esac
fi
;;
remove|unregister)
INTFNAME=$(interfacename $INTERFACE)
OPERSTATE=$(cat /sys/class/net/$INTERFACE/operstate)
if [ "$OPERSTATE" == "down" ]; then
case "$INTFNAME" in
GbE*)
ubus call led.gbe set '{"state" : "off"}'
ubus call led.gbe_phy_link set '{"state" : "off"}'
ubus call led.gbe_phy_speed set '{"state" : "off"}'
$(lan_test) || ubus call led.lan set '{"state":"off"}'
;;
LAN*)
$(lan_test) || ubus call led.lan set '{"state":"off"}'
;;
WAN*)
ubus call led.wan set '{"state" : "off"}'
ubus call led.wan_phy_speed set '{"state" : "off"}'
ubus call led.wan_phy_link set '{"state" : "off"}'
;;
esac
fi
;;
esac

View File

@@ -1,515 +0,0 @@
#!/bin/sh /etc/rc.common
. /lib/functions.sh
include /lib/network
START=20
USE_PROCD=1
DEVICE_ADDED=0
device_config_exists() {
ubus call uci get '{"config":"network","type":"device"}' | grep -w name | grep -qw "$1" && return 0
return 1
}
configure_untagged_vlan() {
local name="$1"
local device="$2"
local ifname="$3"
[ -n "$ifname" -a -n "$name" ] || return
device_config_exists "$ifname" && return
uci -q set network.$name=device
uci -q set network.$name.type=untagged
uci -q set network.$name.ifname="$device"
uci -q set network.$name.name="$ifname"
uci -q commit network
DEVICE_ADDED=1
}
# ATM #
check_pvc() {
local vpi=$1
local vci=$2
local ret
ret=$(xtmctl operate conn --show | awk -v test="$vpi/$vci" '{if ($3==test ) print $5 }')
case $ret in
''|*[!0-9]*) return 0 ;;
*) return $ret ;;
esac
}
check_xtm_list() {
local qclass=$1
local pcr scr mbs
local ret
case $# in
1)
pcr=0
scr=0
mbs=0
;;
2)
pcr=$2
scr=0
mbs=0
;;
4)
pcr=$2
scr=$3
mbs=$4
;;
esac
ret=$(xtmctl operate tdte --show | awk -v test="$qclass" -v pcr="$pcr" -v scr="$scr" -v mbs="$mbs" '{if ($2==test && $3==pcr && $4==scr && $5==mbs ) print $1 }')
case $ret in
''|*[!0-9]*) return 0 ;;
*) return $ret ;;
esac
}
configure_atm_device() {
local name vpi vci device link_type encapsulation qos_class pcr mbs scr
config_get name $1 name "ATM"
config_get vpi $1 vpi "8"
config_get vci $1 vci "35"
config_get device $1 device "atm0"
config_get link_type $1 link_type "eoa"
config_get encapsulation $1 encapsulation "llc"
config_get qos_class $1 qos_class "ubr"
config_get pcr $1 pcr
config_get mbs $1 mbs
config_get scr $1 scr
check_pvc $vpi $vci
ret=$?
if [ "$ret" -eq 0 ]; then
check_xtm_list $qos_class $pcr $scr $mbs
ret=$?
if [ "$ret" -eq 0 ]; then
case $qos_class in # ubr, cbr, gfr, vbr-nrt, vbr-rt, ubr+, abr
ubr)
xtmctl operate tdte --add "$qos_class"
;;
ubr_pcr|ubr+)
xtmctl operate tdte --add "$qos_class" $pcr
;;
cbr)
xtmctl operate tdte --add "$qos_class" $pcr
;;
nrtvbr|vbr-nrt)
xtmctl operate tdte --add "$qos_class" $pcr $scr $mbs
;;
rtvbr|vbr-rt)
xtmctl operate tdte --add "$qos_class" $pcr $scr $mbs
;;
gfr)
;;
abr)
;;
esac
fi
case $link_type in # EoA, IPoA, PPPoA, CIP
EoA|eoa)
[ $encapsulation == "vcmux" ] && encapsulation="vcmux_eth" || encapsulation="llcsnap_eth"
;;
PPPoA|pppoa)
[ $encapsulation == "vcmux" ] && encapsulation="vcmux_pppoa" || encapsulation="llcencaps_ppp"
;;
IPoA|ipoa)
[ $encapsulation == "vcmux" ] && encapsulation="vcmux_ipoa" || encapsulation="llcsnap_rtip"
;;
CIP|cip)
;;
esac
check_xtm_list $qos_class $pcr $scr $mbs
ret="$?"
xtmctl operate conn --add 1.$vpi.$vci aal5 $encapsulation 0 1 $ret
xtmctl operate conn --addq 1.$vpi.$vci 0 wrr 1 dt # low priority queue
xtmctl operate conn --addq 1.$vpi.$vci 1 wrr 1 dt # mid priority queue upstream ACK's and ping from LAN will use this queue
xtmctl operate conn --addq 1.$vpi.$vci 7 wrr 1 dt # high priority queue, internal traffic dhcp igmp dns and icmp
xtmctl operate conn --createnetdev 1.$vpi.$vci $device
xtmctl operate intf --state 1 enable
configure_untagged_vlan "$name" "$device" "$device.1"
[ $DEVICE_ADDED -eq 1 ] && ubus call network reload
fi
}
remove_atm_devices() {
local vpi vci rest
local vpivci=`xtmctl operate conn --show | grep "ATM\|mode" | awk '{if (NR!=1 && $1!="PTM") {print $3}}'`
for i in $vpivci
do
rest=${i#\/}
vpi=${rest%%\/*}
vci=${rest#*\/}
echo "xtmctl operate conn --delete 1.$vpi.$vci"
xtmctl operate conn --delete 1.$vpi.$vci
echo "xtmctl operate conn --deletenetdev 1.$vpi.$vci"
xtmctl operate conn --deletenetdev 1.$vpi.$vci
done
}
create_atm_devices() {
echo "Creating ATM Device(s)"
config_load dsl
config_foreach configure_atm_device atm-device
}
# ATM END #
# PTM #
check_ptm() {
local ret
local ptmprio=$1
local dslat=$2
if [ "$ptmprio" -eq 2 ]; then
ptmprio="high"
else
ptmprio="low"
fi
ret=$(xtmctl operate conn --show | awk -v dslat="$dslat" -v ptmprio="$ptmprio" '{if ($2 == dslat && $3 == ptmprio ) print $2 }')
case $ret in
''|*[!0-9]*) return 0 ;;
*) return $ret ;;
esac
}
configure_ptm_device() {
local name device priority portid
config_get name $1 name "PTM"
config_get device $1 device "ptm0"
config_get priority $1 priority 1
config_get portid $1 portid 1
check_ptm $priority $portid
ret=$?
if [ "$ret" -eq 0 ]; then
xtmctl operate conn --add $portid.$priority
xtmctl operate conn --addq $portid.$priority 0 wrr 1 dt -1 -1 3000 # low priority queue
xtmctl operate conn --addq $portid.$priority 1 wrr 1 dt -1 -1 3000 # mid priority queue upstream ACK's and ping from LAN will use this queue
xtmctl operate conn --addq $portid.$priority 7 wrr 1 dt -1 -1 3000 # high priority queue, internal traffic dhcp igmp dns and icmp
echo "xtmctl operate conn --createnetdev $portid.$priority $device"
xtmctl operate conn --createnetdev $portid.$priority $device
xtmctl operate intf --state 1 enable
configure_untagged_vlan "$name" "$device" "$device.1"
[ $DEVICE_ADDED -eq 1 ] && ubus call network reload
fi
}
remove_ptm_devices() {
local delptm
local x=0
IFS=$'\n'
for i in `xtmctl operate conn --show | grep "PTM\|mode"`
do
if [ $x -eq 1 ]; then
delptm=$(echo $i | awk '{if ($1!="ATM") print $2"."$11}')
echo "xtmctl operate conn --delete $delptm"
xtmctl operate conn --delete $delptm
xtmctl operate conn --deletenetdev $delptm
fi
x=1
done
unset IFS
}
create_ptm_devices() {
echo "Creating PTM Device(s)"
config_load dsl
config_foreach configure_ptm_device ptm-device
}
# PTM END #
prioritize_arp()
{
ebtables -t nat -D POSTROUTING -j mark --mark-or 0x7 -p ARP >/dev/null
ebtables -t nat -A POSTROUTING -j mark --mark-or 0x7 -p ARP >/dev/null
}
remove_devices() {
remove_atm_devices
remove_ptm_devices
}
create_devices() {
local tpstc="$(xdslctl info --show | grep TPS-TC)"
if echo "$tpstc" | grep -q "ATM Mode"; then
create_atm_devices
elif echo "$tpstc" | grep -q "PTM Mode"; then
create_ptm_devices
fi
}
start_dsl() {
local VDSL=0
local GFAST=0
local mod=""
local modes=""
local profile=""
config_load dsl
# Modes
config_get mode line mode
for mod in $mode; do
[ $mod == "gdmt" ] && "${modes}d"
[ $mod == "glite" ] && modes="${modes}l"
[ $mod == "t1413" ] && modes="${modes}t"
[ $mod == "adsl2" ] && modes="${modes}2"
[ $mod == "adsl2p" ] && modes="${modes}p"
[ $mod == "annexl" ] && modes="${modes}e"
[ $mod == "annexm" ] && modes="${modes}m"
[ $mod == "vdsl2" ] && modes="${modes}v" && VDSL=1
[ $mod == "gfast" ] && modes="${modes}f" && GFAST=1
done
# VDSL Profiles
config_get profile line profile
profile="$(echo $profile | sed 's/35b/BrcmPriv1/g')"
# Capabilities
config_get_bool bitswap line bitswap 1
[ $bitswap -eq 1 ] && bitswap="on" || bitswap="off"
config_get_bool sra line sra 1
[ $sra -eq 1 ] && sra="on" || sra="off"
# config_get_bool trellis line trellis 1
# config_get_bool sesdrop line sesdrop 1
# VDSL2 only
config_get_bool us0 line us0 1
[ $us0 -eq 1 ] && us0="on" || us0="off"
# config_get_bool dynamicd line dynamicd 1
# config_get_bool dynamicf line dynamicf 1
# config_get_bool sos line sos 1
echo "Starting DSL"
xtmctl start
xtmctl operate intf --state 1 enable
if [ $VDSL -eq 1 -o $GFAST -eq 1 ]; then
echo "xdslctl start --up --mod $modes --profile "$profile" --sra $sra --bitswap $bitswap --us0 $us0"
xdslctl start --up --mod $modes --profile "$profile" --sra $sra --bitswap $bitswap --us0 $us0
else
echo "xdslctl start --up --mod $modes --sra $sra --bitswap $bitswap"
xdslctl start --up --mod $modes --sra $sra --bitswap $bitswap
fi
if [ $GFAST -eq 1 ]; then
# enable V43 tone set for GFAST
echo "xdslctl configure1 --phycfg 0 0 0 0 0 0 0 0 0 0 0 0x400000 0x400000"
xdslctl configure1 --phycfg 0 0 0 0 0 0 0 0 0 0 0 0x400000 0x400000
fi
}
# CONVERT OLD CONFIG #
convert_old_atm() {
local name ifname baseifname
local vpi vci link_type atmtype pcr scr mbs
local encapseoa encapspppoa encapsipoa encapsulation
config_get atmtype $1 atmtype "ubr"
config_get link_type $1 link_type "EoA"
config_get pcr $1 pcr
config_get scr $1 scr
config_get mbs $1 mbs
config_get vpi $1 vpi "8"
config_get vci $1 vci "35"
config_get encapseoa $1 encapseoa
config_get encapspppoa $1 encapspppoa
config_get encapsipoa $1 encapsipoa
config_get baseifname $1 baseifname "atm0"
config_get name $1 name "ATM$vpi$vci"
uci -q set dsl.$baseifname=atm-device
uci -q set dsl.$baseifname.name="$name"
uci -q set dsl.$baseifname.device="$baseifname"
uci -q set dsl.$baseifname.qos_class="$atmtype"
uci -q set dsl.$baseifname.vpi="$vpi"
uci -q set dsl.$baseifname.vci="$vci"
uci -q set dsl.$baseifname.pcr="$pcr"
uci -q set dsl.$baseifname.mbs="$mbs"
uci -q set dsl.$baseifname.scr="$scr"
case $link_type in
EoA)
uci -q set dsl.$baseifname.link_type="eoa"
[ "$encapseoa" == "vcmux_eth" ] && encapsulation="vcmux" || encapsulation="llc"
uci -q set dsl.$baseifname.encapsulation="$encapsulation"
;;
PPPoA)
uci -q set dsl.$baseifname.link_type="pppoa"
[ "$encapspppoa" == "vcmux_pppoa" ] && encapsulation="vcmux" || encapsulation="llc"
uci -q set dsl.$baseifname.encapsulation="$encapsulation"
;;
IPoA)
uci -q set dsl.$baseifname.link_type="ipoa"
[ "$encapsipoa" == "vcmux_ipoa" ] && encapsulation="vcmux" || encapsulation="llc"
uci -q set dsl.$baseifname.encapsulation="$encapsulation"
;;
esac
}
convert_old_ptm() {
local name ifname baseifname
local dslat ptmprio
config_get name $1 name "PTM"
config_get baseifname $1 baseifname "ptm0"
config_get dslat $1 dslat
config_get ptmprio $1 ptmprio
uci -q set dsl.$baseifname=ptm-device
uci -q set dsl.$baseifname.name="$name"
uci -q set dsl.$baseifname.device="$baseifname"
uci -q set dsl.$baseifname.priority="$ptmprio"
uci -q set dsl.$baseifname.portid="$dslat"
}
convert_old_dsl() {
local cap
sed -i 's/Enabled/1/g' /etc/config/layer2_interface
sed -i 's/Disabled/0/g' /etc/config/layer2_interface
uci -q delete dsl.line.mode
uci -q delete dsl.line.profile
uci -q delete dsl.line.us0
uci -q delete dsl.line.sra
uci -q delete dsl.line.bitswap
config_load layer2_interface
# Mode
config_get_bool cap capabilities GDmt 1
[ $cap -eq 1 ] && uci -q add_list dsl.line.mode=gdmt
config_get_bool cap capabilities Glite 1
[ $cap -eq 1 ] && uci -q add_list dsl.line.mode=glite
config_get_bool cap capabilities T1413 1
[ $cap -eq 1 ] && uci -q add_list dsl.line.mode=t1413
config_get_bool cap capabilities ADSL2 1
[ $cap -eq 1 ] && uci -q add_list dsl.line.mode=adsl2
config_get_bool cap capabilities ADSL2plus 1
[ $cap -eq 1 ] && uci -q add_list dsl.line.mode=adsl2p
config_get_bool cap capabilities AnnexL 1
[ $cap -eq 1 ] && uci -q add_list dsl.line.mode=annexl
config_get_bool cap capabilities AnnexM 1
[ $cap -eq 1 ] && uci -q add_list dsl.line.mode=annexm
config_get_bool cap capabilities VDSL2 1
[ $cap -eq 1 ] && uci -q add_list dsl.line.mode=vdsl2
config_get_bool cap capabilities GFast 0
[ $cap -eq 1 ] && uci -q add_list dsl.line.mode=gfast
# Profile
config_get_bool cap capabilities 8a 1
[ $cap -eq 1 ] && uci -q add_list dsl.line.profile=8a
config_get_bool cap capabilities 8b 1
[ $cap -eq 1 ] && uci -q add_list dsl.line.profile=8b
config_get_bool cap capabilities 8c 1
[ $cap -eq 1 ] && uci -q add_list dsl.line.profile=8c
config_get_bool cap capabilities 8d 1
[ $cap -eq 1 ] && uci -q add_list dsl.line.profile=8d
config_get_bool cap capabilities 12a 1
[ $cap -eq 1 ] && uci -q add_list dsl.line.profile=12a
config_get_bool cap capabilities 12b 1
[ $cap -eq 1 ] && uci -q add_list dsl.line.profile=12b
config_get_bool cap capabilities 17a 1
[ $cap -eq 1 ] && uci -q add_list dsl.line.profile=17a
config_get_bool cap capabilities 30a 1
[ $cap -eq 1 ] && uci -q add_list dsl.line.profile=30a
config_get_bool cap capabilities 35b 0
[ $cap -eq 1 ] && uci -q add_list dsl.line.profile=35b
# Capability
config_get_bool cap capabilities US0 1
uci -q set dsl.line.us0=$cap
config_get_bool cap capabilities bitswap 1
uci -q set dsl.line.bitswap=$cap
config_get_bool cap capabilities sra 1
uci -q set dsl.line.sra=$cap
}
convert_old_config() {
[ -f /etc/config/dsl ] || touch /etc/config/dsl
# DSL
if uci -q get layer2_interface.capabilities >/dev/null; then
convert_old_dsl
fi
# ATM Devices
if uci -q get layer2_interface_adsl.@atm_bridge[0] >/dev/null; then
config_load layer2_interface_adsl
config_foreach convert_old_atm atm_bridge
fi
# PTM Devices
if uci -q get layer2_interface_vdsl.@vdsl_interface[0] >/dev/null; then
config_load layer2_interface_vdsl
config_foreach convert_old_ptm vdsl_interface
fi
uci -q commit dsl
# rm -f /etc/config/layer2_interface
# rm -f /etc/config/layer2_interface_adsl
# rm -f /etc/config/layer2_interface_vdsl
}
# CONVERT OLD CONFIG END#
start_service() {
create_devices
}
stop_service() {
remove_devices
# echo "Stopping DSL"
# stop causes IRQ issues
# xdslctl stop
}
boot() {
local HASADSL="$(db -q get hw.board.hasAdsl)"
local HASVDSL="$(db -q get hw.board.hasVdsl)"
[ "$HASADSL" == "1" -o "$HASVDSL" == "1" ] || return
convert_old_config
prioritize_arp
start_dsl
start
}
reload_service() {
stop
start
}
service_triggers() {
procd_add_reload_trigger dsl layer2_interface layer2_interface_adsl layer2_interface_vdsl
}

View File

@@ -1,119 +0,0 @@
#!/bin/sh /etc/rc.common
. /lib/functions.sh
include /lib/network
START=20
USE_PROCD=1
DEVICE_ADDED=0
device_config_exists() {
ubus call uci get '{"config":"network","type":"device"}' | grep -w name | grep -qw "$1" && return 0
return 1
}
configure_ethernet_iface() {
local name baseifname ifname
config_get name $1 name
config_get baseifname $1 baseifname
config_get ifname $1 ifname
[ -n "$ifname" -a -n "$name" ] || return
device_config_exists "$ifname" && return
uci -q set network.$name=device
uci -q set network.$name.type=untagged
uci -q set network.$name.ifname="$baseifname"
uci -q set network.$name.name="$ifname"
DEVICE_ADDED=1
}
configure_vlan_iface() {
local name baseifname ifname
local vlan8021p vlan8021q
config_get name $1 name
config_get baseifname $1 baseifname
config_get ifname $1 ifname
config_get vlan8021p $1 vlan8021p
config_get vlan8021q $1 vlan8021q
[ -n "$ifname" -a -n "$name" ] || return
device_config_exists "$ifname" && return
uci -q set network.$name=device
uci -q set network.$name.type=8021q
uci -q set network.$name.priority=$vlan8021p
uci -q set network.$name.vid="$vlan8021q"
uci -q set network.$name.ifname="$baseifname"
uci -q set network.$name.name="$ifname"
uci -q commit network
DEVICE_ADDED=1
}
start_service() {
config_load layer2_interface_ethernet
config_foreach configure_ethernet_iface ethernet_interface
config_load layer2_interface_vlan
config_foreach configure_vlan_iface vlan_interface
[ $DEVICE_ADDED -eq 1 ] && ubus call network reload
}
boot() {
local baseifname port unit uplinkport
config_load layer2_interface_ethernet
config_get baseifname Wan baseifname
[ -n "$baseifname" ] || baseifname="$(db -q get hw.board.ethernetWanPort)"
uplinkport=$(uci show ports | grep "uplink='1'" | cut -d'.' -f2)
if [ -n "$uplinkport" ]; then
baseifname="$(uci -q get ports.$uplinkport.ifname)"
else
uplinkport=$(uci show ports | grep "ifname='$baseifname'" | cut -d'.' -f2)
[ -n "$uplinkport" ] && uci -q set ports.$uplinkport.uplink=1 && uci commit ports
fi
# if [ "$(db get hw.board.hardware)" != "EG300" ]; then
# if [ "$(get_port_speed $baseifname)" != "1000FD" ]; then
# ethctl $baseifname phy-power down
# ethctl $baseifname phy-power up
# fi
# fi
for interf in $(db get hw.board.ethernetPortOrder); do
ethswctl -c wan -i $interf -o disable
done
unit=$(echo $(get_port_number $baseifname) | cut -d ' ' -f 1)
port=$(echo $(get_port_number $baseifname) | cut -d ' ' -f 2)
ethswctl -c pause -n $unit -p $port -v 1
ethswctl -c hw-switching -o enable
if [ -n "$baseifname" ]; then
ethswctl -c wan -i $baseifname -o enable
fi
if [ "$(db get hw.board.tm)" == "1" ]; then
for interf in $(db get hw.board.ethernetPortOrder); do
tmctl porttminit --devtype ETH --if $interf --flag 1 || echo "ERROR: porttminit $interf failed!" > /dev/kmsg
done
fi
start
}
service_triggers() {
procd_add_reload_trigger layer2_interface_ethernet layer2_interface_vlan
}

View File

@@ -1,167 +0,0 @@
#!/bin/sh
hasEthWan="$(db -q get hw.board.hasEthWan)"
hasEthWan=${hasEthWan:-1}
hasAdsl="$(db -q get hw.board.hasAdsl)"
hasVdsl="$(db -q get hw.board.hasVdsl)"
LANPORTS="$(db -q get hw.board.ethernetLanPorts)"
ETHDEV=""
PTMDEV=""
ATMDEV=""
WANIFACE=""
device_config_exists() {
ubus call uci get '{"config":"network","type":"device"}' | grep -w name | grep -qw "$1" && return 0
return 1
}
populate_dsl_settings() {
if [ "$hasAdsl" == "0" -a "$hasVdsl" == "0" ]; then
rm -f /etc/config/dsl
return
else
touch /etc/config/dsl
fi
if ! uci -q get dsl.line >/dev/null; then
uci -q set dsl.line="dsl-line"
if [ "$hasAdsl" == "1" ]; then
# Mode
uci -q add_list dsl.line.mode=gdmt
uci -q add_list dsl.line.mode=glite
uci -q add_list dsl.line.mode=t1413
uci -q add_list dsl.line.mode=adsl2
uci -q add_list dsl.line.mode=adsl2p
uci -q add_list dsl.line.mode=annexl
uci -q add_list dsl.line.mode=annexm
uci -q add_list dsl.line.mode=vdsl2
#uci -q add_list dsl.line.mode=gfast
fi
if [ "$hasVdsl" == "1" ]; then
# Mode
uci -q add_list dsl.line.mode=vdsl2
# Profile
uci -q add_list dsl.line.profile=8a
uci -q add_list dsl.line.profile=8b
uci -q add_list dsl.line.profile=8c
uci -q add_list dsl.line.profile=8d
uci -q add_list dsl.line.profile=12a
uci -q add_list dsl.line.profile=12b
uci -q add_list dsl.line.profile=17a
uci -q add_list dsl.line.profile=30a
#uci -q add_list dsl.line.profile=35b
# Capability
uci -q set dsl.line.us0=1
fi
# Capability
uci -q set dsl.line.bitswap=1
uci -q set dsl.line.sra=1
fi
uci -q commit dsl
}
populate_atm_device() {
[ "$hasAdsl" == "0" ] && return
# ATM Device
if ! uci -q get dsl.@atm-device[0] >/dev/null; then
uci -q set dsl.atm0=atm-device
uci -q set dsl.atm0.name="ATM835"
uci -q set dsl.atm0.device="atm0"
uci -q set dsl.atm0.vpi="8"
uci -q set dsl.atm0.vci="35"
uci -q set dsl.atm0.qos_class="ubr"
uci -q set dsl.atm0.link_type="eoa"
uci -q set dsl.atm0.encapsulation="llc"
uci -q commit dsl
else
ATMDEV="$(uci -q get dsl.@atm-device[0].device)"
fi
ATMDEV="${ATMDEV:-atm0}"
WANIFACE="$ATMDEV.1"
device_config_exists "$WANIFACE" && return
uci -q set network.atmwan=device
uci -q set network.atmwan.type=untagged
uci -q set network.atmwan.ifname="$ATMDEV"
uci -q set network.atmwan.name="$WANIFACE"
}
populate_ptm_device() {
[ "$hasVdsl" == "0" ] && return
# PTM Device
if ! uci -q get dsl.@ptm-device[0] >/dev/null; then
uci -q set dsl.ptm0=atm-device
uci -q set dsl.ptm0.name="PTM"
uci -q set dsl.ptm0.device="ptm0"
uci -q set dsl.ptm0.priority="1"
uci -q set dsl.ptm0.portid="1"
uci -q commit dsl
else
PTMDEV="$(uci -q get dsl.@ptm-device[0].device)"
fi
PTMDEV="${PTMDEV:-ptm0}"
WANIFACE="$PTMDEV.1"
device_config_exists "$PTMDEV" && return
uci -q set network.ptmwan=device
uci -q set network.ptmwan.type=untagged
uci -q set network.ptmwan.ifname="$PTMDEV"
uci -q set network.ptmwan.name="$WANIFACE"
}
populate_eth_device() {
[ "$hasEthWan" == "0" ] && return
ETHDEV="$(db -q get hw.board.ethernetWanPort)"
WANIFACE="$ETHDEV.1"
device_config_exists "$WANIFACE" && return
uci -q set network.ethwan=device
uci -q set network.ethwan.type=untagged
uci -q set network.ethwan.ifname="$ETHDEV"
uci -q set network.ethwan.name="$WANIFACE"
}
populate_network_config_ifnames() {
# LAN ports
uci -q get network.lan.ifname >/dev/null || uci -q set network.lan.ifname="$LANPORTS"
[ $((hasEthWan+hasAdsl+hasVdsl)) -eq 0 ] && {
uci -q commit network
return
}
WANTYPE="$(uci -q get network.wan.type)"
[ "$WANTYPE" == "anywan" ] && {
uci -q delete network.wan.type
uci -q set network.wan.ifname="$WANIFACE"
}
uci -q get network.wan.ifname >/dev/null || uci -q set network.wan.ifname="$WANIFACE"
uci -q commit network
}
populate_dsl_settings
populate_atm_device
populate_ptm_device
populate_eth_device
populate_network_config_ifnames

View File

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_RELEASE:=1
PKG_VERSION:=0.1
PKG_SOURCE_URL:=git@public.inteno.se:libpicoevent.git
PKG_SOURCE_URL:=http://public.inteno.se/libpicoevent
PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=c96770b32f66c6e799f8430d8e85d94780358135
PKG_NAME:=libpicoevent

13
mosquitto/Config.in Normal file
View File

@@ -0,0 +1,13 @@
config MOSQUITTO_LWS
bool "libwebsockets support"
depends on PACKAGE_mosquitto-ssl
default y
help
Includes websockets support in the broker, via libwebsockets
config MOSQUITTO_PASSWD
bool "Include mosquitto_passwd utility"
depends on PACKAGE_mosquitto-ssl
default y
help
mosquitto_passwd is a tool for managing password files for mosquitto.

231
mosquitto/Makefile Normal file
View File

@@ -0,0 +1,231 @@
#
# Copyright (C) 2011-2013 OpenWrt.org
# Copyright (C) 2010 Jo-Philipp Wich <xm@subsignal.org>
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=mosquitto
PKG_VERSION:=1.4.15
PKG_RELEASE:=3
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE.txt
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://mosquitto.org/files/source/
PKG_HASH:=7d3b3e245a3b4ec94b05678c8199c806359737949f4cfe0bf936184f6ca89a83
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk
define Package/mosquitto/default
SECTION:=net
CATEGORY:=Network
TITLE:=mosquitto - an MQTT message broker
URL:=http://www.mosquitto.org/
MAINTAINER:=Karl Palsson <karlp@etactica.com>
DEPENDS:= +librt +libuuid
USERID:=mosquitto=200:mosquitto=200
endef
define Package/mosquitto-ssl
$(call Package/mosquitto/default)
TITLE+= (with SSL support)
DEPENDS+= +libopenssl +MOSQUITTO_LWS:libwebsockets-openssl
VARIANT:=ssl
PROVIDES:=mosquitto
endef
define Package/mosquitto-nossl
$(call Package/mosquitto/default)
TITLE+= (without SSL support)
VARIANT:=nossl
PROVIDES:=mosquitto
endef
define Package/mosquitto-ssl/config
source "$(SOURCE)/Config.in"
endef
define Package/mosquitto/default/description
Mosquitto is an open source (BSD licensed) message broker that implements
the MQTT protocol version 3.1 and 3.1.1. MQTT provides a lightweight
method of carrying out messaging using a publish/subscribe model.
This package also includes some basic support for configuring via UCI
endef
define Package/mosquitto-ssl/description
$(call Package/mosquitto/default/description)
This package is built with SSL support. TLS-PSK will be included (in both
the client and broker) if OpenSSL is built with TLS-PSK support.
endef
define Package/mosquitto-nossl/description
$(call Package/mosquitto/default/description)
This package is built WITHOUT SSL support.
endef
define Package/mosquitto-client/default
$(Package/mosquitto/default)
TITLE:= mosquitto - client tools
DEPENDS+=+libcares
PROVIDES:=mosquitto-client
endef
define Package/mosquitto-client-ssl
$(call Package/mosquitto-client/default)
TITLE+= (With SSL support)
DEPENDS+=+libmosquitto-ssl
VARIANT:=ssl
endef
define Package/mosquitto-client-nossl
$(call Package/mosquitto-client/default)
TITLE+= (Without SSL support)
DEPENDS+=+libmosquitto-nossl
VARIANT:=nossl
endef
define Package/mosquitto-client/default/description
Command line client tools for publishing messages to MQTT servers
and subscribing to topics.
endef
define Package/mosquitto-client-ssl/description
$(call Package/mosquitto-client/default/description)
This package is built with SSL support
endef
define Package/mosquitto-client-nossl/description
$(call Package/mosquitto-client/default/description)
This package is built without SSL support
endef
define Package/libmosquitto/default
$(Package/mosquitto/default)
SECTION:=libs
CATEGORY:=Libraries
DEPENDS:=+libpthread +librt +libcares
TITLE:= mosquitto - client library
PROVIDES:=libmosquitto
endef
define Package/libmosquitto-ssl
$(call Package/libmosquitto/default)
TITLE+= (With SSL Support)
DEPENDS+= +libopenssl
VARIANT=ssl
endef
define Package/libmosquitto-nossl
$(call Package/libmosquitto/default)
TITLE+= (Without SSL Support)
VARIANT=nossl
endef
define Package/libmosquitto/default/description
Library required for mosquitto's command line client tools, also for
use by any third party software that wants to communicate with a
mosquitto server.
Should be useable for communicating with any MQTT v3.1/3.1.1 compatible
server, such as IBM's RSMB, in addition to Mosquitto
endef
define Package/libmosquitto-ssl/description
$(call Package/libmosquitto/default/description)
This package is built with SSL support
endef
define Package/libmosquitto-nossl/description
$(call Package/libmosquitto/default/description)
This package is built without SSL support
endef
define Package/libmosquittopp
SECTION:=libs
CATEGORY:=Libraries
DEPENDS:=libmosquitto +libstdcpp
TITLE:= mosquitto - client c++ library
endef
define Package/libmosquittopp/description
C++ Library wrapper for libmosquitto.
endef
define Package/mosquitto-ssl/conffiles
/etc/mosquitto/mosquitto.conf
/etc/config/mosquitto
endef
Package/mosquitto-nossl/conffiles = $(Package/mosquitto-ssl/conffiles)
define Package/mosquitto/install/default
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mosquitto $(1)/usr/sbin/mosquitto
$(INSTALL_DIR) $(1)/etc/mosquitto
$(INSTALL_CONF) $(PKG_BUILD_DIR)/mosquitto.conf $(1)/etc/mosquitto/mosquitto.conf
$(CP) ./files/* $(1)/
endef
define Package/mosquitto-nossl/install
$(call Package/mosquitto/install/default,$(1))
endef
define Package/mosquitto-ssl/install
$(call Package/mosquitto/install/default,$(1))
ifeq ($(CONFIG_MOSQUITTO_PASSWD),y)
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mosquitto_passwd $(1)/usr/bin
endif
endef
define Package/mosquitto-client-ssl/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/client/mosquitto_pub $(1)/usr/bin/mosquitto_pub
$(INSTALL_BIN) $(PKG_BUILD_DIR)/client/mosquitto_sub $(1)/usr/bin/mosquitto_sub
endef
Package/mosquitto-client-nossl/install = $(Package/mosquitto-client-ssl/install)
# This installs files into ./staging_dir/. so that you can cross compile from the host
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_BUILD_DIR)/lib/mosquitto.h $(1)/usr/include
$(CP) $(PKG_BUILD_DIR)/lib/cpp/mosquittopp.h $(1)/usr/include
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/lib/libmosquitto.so.1 $(1)/usr/lib/
$(CP) $(PKG_BUILD_DIR)/lib/cpp/libmosquittopp.so.1 $(1)/usr/lib/
$(LN) libmosquitto.so.1 $(1)/usr/lib/libmosquitto.so
$(LN) libmosquittopp.so.1 $(1)/usr/lib/libmosquittopp.so
endef
# This installs files on the target. Compare with Build/InstallDev
define Package/libmosquitto-ssl/install
$(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/libmosquitto.so.1 $(1)/usr/lib/
$(LN) libmosquitto.so.1 $(1)/usr/lib/libmosquitto.so
endef
Package/libmosquitto-nossl/install = $(Package/libmosquitto-ssl/install)
define Package/libmosquittopp/install
$(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/cpp/libmosquittopp.so.1 $(1)/usr/lib/
$(LN) libmosquittopp.so.1 $(1)/usr/lib/libmosquittopp.so
endef
# Applies to all...
MAKE_FLAGS += WITH_DOCS=no UNAME=Linux
ifeq ($(BUILD_VARIANT),nossl)
MAKE_FLAGS += WITH_TLS=no WITH_WEBSOCKETS=no
else
MAKE_FLAGS += WITH_WEBSOCKETS=$(if $(CONFIG_MOSQUITTO_LWS),"yes","no")
MAKE_FLAGS += WITH_TLS_PSK=$(if $(CONFIG_OPENSSL_WITH_PSK),"yes","no")
endif
$(eval $(call BuildPackage,mosquitto-ssl))
$(eval $(call BuildPackage,mosquitto-nossl))
$(eval $(call BuildPackage,libmosquitto-ssl))
$(eval $(call BuildPackage,libmosquitto-nossl))
$(eval $(call BuildPackage,libmosquittopp))
$(eval $(call BuildPackage,mosquitto-client-ssl))
$(eval $(call BuildPackage,mosquitto-client-nossl))

View File

@@ -0,0 +1,4 @@
config owrt owrt
option use_uci 0
config mosquitto mosquitto

View File

@@ -0,0 +1,211 @@
#!/bin/sh /etc/rc.common
# Basic init script for mosquitto
# April 2012, OpenWrt.org
# Provides support for the luci-app-mosquitto package, if installed
START=80
USE_PROCD=1
TCONF=/tmp/mosquitto.generated.conf
# Usage: append_if cfg uci_name output_name
# add a config line of the form "output_name <value>"
# if the "uci_name" was found.
# output_name defaults to uci_name if not specified.
append_if() {
local cfg="$1"
local uci_name="$2"
local out_name="$3"
if [ -z "$out_name" ]; then
out_name=$uci_name
fi
config_get val $cfg $uci_name
if [ -n "$val" ]; then
echo "$out_name $val" >> $TCONF
fi
}
# mosquitto uses true/false, uci uses 1/0
# note that this is not shell truthy, but equality with 1!
append_bool() {
if [ $2 -eq 1 ]; then
echo "$1 true" >> $TCONF
else
echo "$1 false" >> $TCONF
fi
}
# as per append_if, but gets the value as a uci bool, not raw
append_optional_bool() {
local cfg="$1"
local uci_name="$2"
local out_name="$3"
config_get val $cfg $uci_name
if [ -n "$val" ]; then
config_get_bool real $cfg $uci_name
append_bool $out_name $real
fi
}
convert_mosq_general() {
local cfg="$1"
config_get destinations "$1" log_dest
for dest in $destinations; do
echo "log_dest $dest" >> $TCONF
done
config_get_bool no_remote "$1" no_remote_access 0
if [ "$no_remote" -eq 1 ]; then
echo "bind_address localhost" >> $TCONF
fi
config_get port "$1" port 1883
echo "port $port" >> $TCONF
append_if "$1" protocol
append_if "$1" max_inflight_messages
append_if "$1" max_queued_messages
append_if "$1" sys_interval
}
convert_persistence() {
local cfg="$1"
append_if "$cfg" client_expiration persistent_client_expiration
append_if "$cfg" autosave_interval
append_optional_bool "$cfg" autosave_on_changes autosave_on_changes
append_optional_bool "$cfg" persistence persistence
append_if "$cfg" file persistence_file
config_get loc "$cfg" location
if [ -n "$loc" ]; then
[ -d "$loc" ] || {
mkdir -p "$loc";
chown mosquitto "$loc";
}
echo "persistence_location $loc" >> $TCONF
fi
}
add_listener() {
echo "" >> $TCONF
config_get port "$1" port
if [ -z "$port" ]; then
echo "Ignoring listener section without port"
return
fi
config_get_bool no_remote "$1" no_remote_access 0
if [ "$no_remote" -eq 1 ]; then
echo "listener $port 127.0.0.1" >> $TCONF
else
echo "listener $port" >> $TCONF
fi
append_if "$1" protocol
append_if "$1" http_dir
append_optional_bool "$1" use_username_as_clientid use_username_as_clientid
append_if "$1" cafile
append_if "$1" capath
append_if "$1" certfile
append_if "$1" keyfile
append_if "$1" tls_version
append_optional_bool "$1" require_certificate require_certificate
append_optional_bool "$1" use_identity_as_username use_identity_as_username
append_if "$1" crlfile
append_if "$1" ciphers
append_if "$1" psk_hint
}
add_topic() {
echo "topic $1" >> $TCONF
}
add_bridge() {
config_get conn "$1" connection
config_get addr "$1" address
if [ -z "$conn" -o -z "$addr" ]; then
echo "Ignoring bridge section, misisng connection/address"
return
fi
echo "" >> $TCONF
echo "# Bridge connection from UCI section" >> $TCONF
append_if "$1" connection
append_if "$1" address
config_list_foreach "$1" topic add_topic
append_optional_bool "$1" cleansession cleansession
append_optional_bool "$1" try_private try_private
append_optional_bool "$1" notifications notifications
append_optional_bool "$1" round_robin round_robin
# Note, deprecated upstream, preserve old uci configs
append_if "$1" clientid remote_clientid
append_if "$1" remote_clientid
append_if "$1" local_clientid
append_if "$1" notification_topic
append_if "$1" keepalive_interval
append_if "$1" start_type
append_if "$1" restart_timeout
append_if "$1" idle_timeout
append_if "$1" threshold
append_if "$1" protocol_version bridge_protocol_version
append_optional_bool "$1" attempt_unsubscribe bridge_attempt_unsubscribe
append_if "$1" identity bridge_identity
append_if "$1" psk bridge_psk
append_if "$1" tls_version bridge_tls_version
append_if "$1" restart_timeout
append_if "$1" capath bridge_capath
append_if "$1" cafile bridge_cafile
append_if "$1" certfile bridge_certfile
append_if "$1" keyfile bridge_keyfile
# Note, deprecated upstream, preserve old uci configs
append_if "$1" username remote_username
# Note, deprecated upstream, preserve old uci configs
append_if "$1" password remote_password
append_if "$1" remote_username
append_if "$1" remote_password
}
convert_uci() {
rm -rf $TCONF
echo "Generating mosquitto config file in $TCONF"
echo "# mosquitto.conf file generated from UCI config." >>$TCONF
# Don't include a timestamp, it makes md5sum compares fail
config_load mosquitto
config_foreach convert_mosq_general "mosquitto"
config_foreach convert_persistence "persistence"
config_foreach add_listener "listener"
config_foreach add_bridge "bridge"
}
start_service_real() {
local cfg="$1"
local use_uci write_pid
config_get use_uci "$cfg" use_uci
if [ "$use_uci" -eq 1 ]; then
CONF=$TCONF
convert_uci
else
CONF=/etc/mosquitto/mosquitto.conf
fi
config_get write_pid "$cfg" write_pid 0
procd_open_instance
procd_set_param command mosquitto
procd_append_param command -c $CONF
# Makes /etc/init.d/mosquitto reload work if you edit the final file.
procd_set_param file $CONF
[ "$write_pid" -eq 1 ] && procd_set_param pidfile /var/run/mosquitto.pid
procd_close_instance
}
start_service() {
config_load mosquitto
config_foreach start_service_real owrt
}
service_triggers() {
# Makes "reload_config" work
procd_add_reload_trigger "mosquitto"
}

46
onboardingd/Makefile Normal file
View File

@@ -0,0 +1,46 @@
#
# Copyright (C) 2013 Inteno
#
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=onboardingd
PKG_VERSION:=0.1
PKG_SOURCE_VERSION:=1b8501d5a24fcdf784678e8f864964fc0138254c
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=git@private.inteno.se:iopsys-onboarding.git
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk
define Package/onboardingd
CATEGORY:=Utilities
DEPENDS:=+libuci +libubox +ubus +libpthread +TARGET_iopsys_ramips:swconfig +TARGET_iopsys_ramips:libnl-tiny +libopenssl +libmosquitto +libcurl
TITLE:=package for onboarding project, as well as some dongle stuff
endef
define Package/onboardingd/description
questd collects system and network information and presents
this information via ubus
endef
define Package/onboardingd/install
$(CP) ./files/* $(1)/ # copy from files to final image
$(INSTALL_DIR) $(1)/sbin # make the dir
$(INSTALL_BIN) $(PKG_BUILD_DIR)/parser $(1)/sbin/ # copy binaries to new directory
$(INSTALL_BIN) $(PKG_BUILD_DIR)/dongle_apn $(1)/sbin/ # copy binaries to new directory
$(INSTALL_BIN) $(PKG_BUILD_DIR)/dongle_pin $(1)/sbin/ # copy binaries to new directory
$(INSTALL_BIN) $(PKG_BUILD_DIR)/dongle_network $(1)/sbin/ # copy binaries to new directory
$(INSTALL_BIN) $(PKG_BUILD_DIR)/watcher $(1)/sbin/ # copy binaries to new directory
$(INSTALL_DIR) $(1)/root/json # create the directory JSON in root
$(CP) ./json/* $(1)/root/json # copy files from JSON folder to router JSON
$(CP) ./json/* $(1)/root/
endef
$(eval $(call BuildPackage,onboardingd))

View File

@@ -0,0 +1,3 @@
config onboarding onboarding
option loglevel 0
option file '/root/json/aps.json'

View File

@@ -0,0 +1,84 @@
#!/bin/sh /etc/rc.common
START=14
STOP=96
USE_PROCD=1
NAME=onboardingd
start_service() {
config_load onboarding
config_get loglevel onboarding loglevel "0"
config_get file onboarding file false
procd_open_instance
procd_set_param command "/sbin/watcher"
procd_append_param command --loglevel "$loglevel"
if [ "$file" ]
then
procd_append_param command --path "$file"
fi
procd_set_param respawn
procd_set_param stdout 1
procd_set_param stderr 1
procd_close_instance
procd_open_instance
procd_set_param command "/sbin/parser"
procd_append_param command --loglevel "$loglevel"
if [ "$file" ]
then
procd_append_param command --path "$file"
fi
procd_set_param respawn
procd_set_param stdout 1
procd_set_param stderr 1
procd_close_instance
procd_open_instance
procd_set_param command "/sbin/dongle_apn"
procd_set_param respawn
procd_set_param stdout 1
procd_set_param stderr 1
procd_close_instance
procd_open_instance
procd_set_param command "/sbin/dongle_network"
procd_set_param respawn
procd_set_param stdout 1
procd_set_param stderr 1
procd_close_instance
procd_open_instance
procd_set_param command "/sbin/dongle_pin"
procd_set_param respawn
procd_set_param stdout 1
procd_set_param stderr 1
procd_close_instance
}
#start() {
# service_start /sbin/watcher
# service_start /sbin/parser
#}
#stop() {
#stop_service() is called after procd killed the service
# service_stop /sbin/watcher
# service_stop /sbin/parser
#}
service_triggers()
{
procd_add_reload_trigger onboarding
#echo "trigger"
}
reload_service() {
stop
start
}

View File

@@ -0,0 +1,53 @@
#!/bin/ash
. /lib/functions.sh
. /usr/share/libubox/jshn.sh
handle_interface() {
local config="$1"
local file, loglevel
config_get file $section "file"
config_get loglevel $section "loglevel"
json_init
json_add_string "file" "$file"
json_add_string "loglevel" "$loglevel"
json_dump
}
case "$1" in
list)
json_init
json_add_object "status"
json_close_object
json_add_object "set_configurations"
json_add_string "loglevel" "x"
json_add_string "file" "x"
json_close_object
json_dump
;;
call)
case "$2" in
status)
config_load onboarding
config_foreach handle_interface onboarding
;;
set_configurations)
local input, loglevel, file
read input
json_load $input
json_get_var loglevel loglevel
json_get_var file file
uci_set onboarding onboarding loglevel "$loglevel"
uci_set onboarding onboarding file "$file"
uci_commit onboarding
config_load onboarding
config_foreach handle_interface onboarding
/etc/init.d/onboarding restart
;;
esac
;;
esac

26
onboardingd/json/aps.json Normal file
View File

@@ -0,0 +1,26 @@
{
"access_points": [
{
"ssid": "o",
"snr": 1,
"channel": 11,
"author": {
"first_name": "Jakob",
"last_name": "Olson"
},
"test_obj": {
"inner_test": 1
},
"array1" : [
{
"inner_array" : [
],
"field5": 0,"a3":2,"a4":5
},
{
"field1": 3, "b2":1, "v4": 5
}
]
}
]
}

View File

@@ -13,7 +13,7 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO=git
PKG_SOURCE_URL:=http://public.inteno.se/owsd.git
PKG_SOURCE_VERSION:=1a815efff25ae4d52bfee67cc4642eb4627f1388
PKG_SOURCE_VERSION:=fa25ad0b5af3c9a5c16124a9f699dae3be7b68dd
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
PKG_MAINTAINER:=Sartura Support for Inteno <support-inteno@sartura.hr>

View File

@@ -1,7 +1,7 @@
config owsd 'global'
option sock '/var/run/ubus.sock'
option www '/www'
option redirect '/cgi-bin/luci:/cacheflush.html'
# option redirect '/cgi-bin/luci:/cacheflush.html'
# option www_maxage '3600'
# ubusproxy is enbaled if: enable = 1 or peer exists or path exists

View File

@@ -151,6 +151,7 @@ validate_owsd_iface() {
'whitelist_dhcp_domains:bool:0' \
'ipv6:bool:1' \
'ipv6only:bool:0' \
'linklocal:bool:0' \
'cert:file' \
'key:file' \
'ca:file' \
@@ -160,7 +161,7 @@ validate_owsd_iface() {
}
parse_owsd_iface() {
local port interface whitelist_interface_as_origin whitelist_dhcp_domains ipv6 ipv6only
local port interface whitelist_interface_as_origin whitelist_dhcp_domains ipv6 ipv6only linklocal
local cert key ca
local restrict_to_user
@@ -199,7 +200,7 @@ parse_owsd_iface() {
}
local http="http${cert:+s}"
local ip4addrs ip6addrs
local ip4addrs ip6addrs linklocaladdrs
# bind to some network
if [ -n "${interface}" ]; then
@@ -217,6 +218,11 @@ parse_owsd_iface() {
# ipv6 addresses
if [ "${ipv6}" -eq 1 ]; then
network_get_ipaddrs6 ip6addrs "${interface}"
if [ "${linklocal}" -eq 1 ]; then
network_get_device device "${interface}"
[ -n "${device}" ] && linklocaladdrs=$(ifconfig $device | grep inet6 | grep Scope:Link | awk '{print$3}' | cut -d'/' -f1)
ip6addrs="${ip6addrs} ${linklocaladdrs}"
fi
fi
for addr in ${ip6addrs}; do
new_listen_socket "$1" "${addr}"

View File

@@ -36,7 +36,7 @@ define Package/peripheral_manager
CATEGORY:=Utilities
TITLE:=Application deamon for handling of peripheral
URL:=
DEPENDS:=+libuci +libubus +libblobmsg-json +PACKAGE_bcmkernel:bcmkernel
DEPENDS:=+libuci +libubus +libblobmsg-json +PACKAGE_bcmkernel:bcmkernel +PACKAGE_bcmopen:bcmopen
endef
define Package/peripheral_manager/description

View File

@@ -26,9 +26,10 @@ check_for_config(){
uci set ports.@ethport[-1].name="$(interfacename $port)"
uci set ports.@ethport[-1].ifname=$port
uci set ports.@ethport[-1].speed='auto'
if [ "$(interfacename $port)" = "WAN" ]
if [ "$(db -q get hw.board.ethernetWanPort)" = "$port" ]
then
uci set ports.@ethport[-1].pause=1
uci set ports.@ethport[-1].uplink=1
else
uci set ports.@ethport[-1].pause=0
fi

View File

@@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=questd
PKG_VERSION:=3.1.40
PKG_SOURCE_VERSION:=44852fcce18b5ceefa6b09bd5eb775d783ee6362
PKG_SOURCE_VERSION:=11dd6f37554f87c767560b3d1d4eba2e2a4ed0ef
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=http://public.inteno.se:/questd
@@ -43,7 +43,7 @@ export QUESTD_CFLAGS
define Package/questd
CATEGORY:=Utilities
DEPENDS:=+libuci +libubox +ubus +libpthread +(TARGET_iopsys_ramips):swconfig +(TARGET_iopsys_ramips):libnl-tiny +libopenssl
DEPENDS:=+libuci +libubox +ubus +libpthread +TARGET_iopsys_ramips:swconfig +TARGET_iopsys_ramips:libnl-tiny +libopenssl
TITLE:=router info daemon
endef

Some files were not shown because too many files have changed in this diff Show More