aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-07-22Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'upstream-masterLuis Hector Chavez
17f710e libweave: Update libchrome APIs to r405848
2016-07-22libweave: Update libchrome APIs to r405848Luis Hector Chavez
The new libchrome has been ported from Chromium and some APIs have changed. Make necessary changes at call sites. Notable changes are: - base::Bind() now explicitly disallows captures in lambdas (which was never allowed in the style guide). - base::ListValue::iterator now exposes std::unique_ptr<base::Value> instead of raw base::Value*. BUG=29104761 TEST=All tests in libweave_test pass on dragonboard-eng build TEST=make testall Change-Id: Ifb2d4f83f9f92b8ded5f12ac1c622e8ab5549b7d Reviewed-on: https://weave-review.googlesource.com/4185 Reviewed-by: Robert Ginda <rginda@google.com>
2016-06-01Reland "Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'"Luis Hector Chavez
This reverts commit abfe7a063bbaebdca8703d27137c8c9aed826dac. All necessary changes are ready in AOSP for this to land. Change-Id: I9ac99ebbb292e047e6d6a7978e5748987d7f0f9d Reviewed-on: https://weave-review.googlesource.com/3720 Reviewed-by: Alex Vakulenko <avakulenko@google.com>
2016-05-31Revert "Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'"Luis Hector Chavez
This reverts commit 43625e411feabd7df36a8768ba8c4eca58a22e4d. This needs to happen in a staged fashion to avoid build breakages :/ Change-Id: Ie5474629bd301d7af27ee6167988b0381ac73271 Reviewed-on: https://weave-review.googlesource.com/3700 Reviewed-by: Luis Hector Chavez <lhchavez@google.com>
2016-05-27Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'Luis Hector Chavez
eed24467 Add volume trait to the test_schema device. 369d2f07 correcting volume property maximum value in if condition checking of volume trait of test_schema device. d1f98a07 examples: remove samples with private traits 637be79 libweave: Update libchrome APIs to r395517 Change-Id: I69b312a616e67970f5cce82e7bd53a6dd266f36c
2016-05-27libweave: Update libchrome APIs to r395517Luis Hector Chavez
The new libchrome has been ported from Chromium and some APIs have changed. Make necessary changes at call sites. BUG: 28985443 TEST: All tests in libweave_test pass on dragonboard-eng build TEST: make testall Change-Id: Iccc8acbd968bc104af44a9053570edf028323cf5 Reviewed-on: https://weave-review.googlesource.com/3611 Reviewed-by: Alex Vakulenko <avakulenko@google.com>
2016-05-05examples: remove samples with private traitsJohan Euphrosine
Change-Id: Icd89ae8db2d73c398ab779748a35eeb35617bbe4 Reviewed-on: https://weave-review.googlesource.com/3270 Reviewed-by: Paul Westbrook <pwestbro@google.com>
2016-04-26correcting volume property maximum value in if condition checking of volume ↵Surender Kodam
trait of test_schema device. Change-Id: I446cf3e0dcdcd6f641d2d06f1b09fa2318793a68 Reviewed-on: https://weave-review.googlesource.com/3260 Reviewed-by: Alex Vakulenko <avakulenko@google.com>
2016-04-22Add volume trait to the test_schema device.Surender Kodam
Change-Id: I27d9575ad4710d0f9a8ad9b47cb800afd44c80fd Reviewed-on: https://weave-review.googlesource.com/3252 Reviewed-by: Alex Vakulenko <avakulenko@google.com>
2016-04-21Merge "Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'" ↵Gerrit Code Review
into aosp-master
2016-04-21Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'Alex Vakulenko
5e67ce2 libweave: Split "base" trait into "device" and "privet". 22ca81a libweave: Clean up code 3f59975 libweave: Fix build break on Brillo e90f36f libweave: Update comment on handling new commands bf7d663 README: update pre-requisites 8ee0c1e libweave: Reformat examples/provider/README daeafc6 libweave: Remove unused local constant 25845ac add _ledflasher traits to the test_schema device. Change-Id: I379a48da3fc955cd553a8954ffad8af47eb3200f
2016-04-21libweave: Split "base" trait into "device" and "privet".Alex Vakulenko
The original "base" trait has been split into two and those traits have slightly different definitions (e.g. now device name, description and location are part of "device" trait's state, instead of the global device resource). Updated tests to reflect the new traits. BUG: None Change-Id: I9a1a1bfc3c01d67dd0ac519106c5d20c25a62f38 Reviewed-on: https://weave-review.googlesource.com/3146 Reviewed-by: Alex Vakulenko <avakulenko@google.com>
2016-04-20libweave: Clean up codeAlex Vakulenko
Fixed minor issues like misspelling in comments, formatting. Removed unused function prototypes and make sure function declarations match exactly the implementations. Change-Id: Ie30342657c0c22fa19b1546321400cc65d0e028d Reviewed-on: https://weave-review.googlesource.com/3230 Reviewed-by: Robert Ginda <rginda@google.com>
2016-04-18libweave: Fix build break on BrilloAlex Vakulenko
The private member |currently_online_| is no longer used and causes the following error on Android/Brillo builds: external/libweave/src/privet/wifi_bootstrap_manager.h:109:8: error: private field 'currently_online_' is not used [-Werror,-Wunused-private-field] Remove the field to fix the compile break. Change-Id: I0830a4d12f777956638a12514565bb2270680e34 Reviewed-on: https://weave-review.googlesource.com/3221 Reviewed-by: Robert Ginda <rginda@google.com>
2016-04-18libweave: Fix build break on BrilloAlex Vakulenko
The private member |currently_online_| is no longer used and causes the following error on Android/Brillo builds: external/libweave/src/privet/wifi_bootstrap_manager.h:109:8: error: private field 'currently_online_' is not used [-Werror,-Wunused-private-field] Remove the field to fix the compile break. Change-Id: I0830a4d12f777956638a12514565bb2270680e34 Reviewed-on: https://weave-review.googlesource.com/3220 Reviewed-by: Robert Ginda <rginda@google.com>
2016-04-13libweave: Update comment on handling new commandsMike Colagrosso
The old comment in DeviceRegistrationInfo::OnCommandCreated() was left over from when the code would use the command received via the notification channel. Now the code always fetches commands from the command queue when it receives a notification that there is a new command. The code ignores the actual command in the notification payload. Change-Id: I1b7f7eedc337280035a5a6ec45f5935f780cac7f Reviewed-on: https://weave-review.googlesource.com/3190 Reviewed-by: John Mccullough <jmccullough@google.com>
2016-04-12README: update pre-requisitesJohan Euphrosine
- remove outdated deps - add cmake Change-Id: I5791f215aa26f9792cf20ba8593855484a887a51 Reviewed-on: https://weave-review.googlesource.com/3182 Reviewed-by: Paul Westbrook <pwestbro@google.com>
2016-04-07libweave: Reformat examples/provider/READMEMike Colagrosso
This change indents nested lists at four spaces, which renders them properly. Change-Id: I8bc972e8c14ec973223e5115f8109aa8e79f8ba2 Reviewed-on: https://weave-review.googlesource.com/3174 Reviewed-by: Johan Euphrosine <proppy@google.com>
2016-04-07libweave: Remove unused local constantAlex Vakulenko
This causes on clang. Change-Id: I8bdffc52e9000c4033927555032b8b8294b80cfd Reviewed-on: https://weave-review.googlesource.com/3172 Reviewed-by: Alex Vakulenko <avakulenko@google.com> (cherry picked from commit daeafc6e42c1acb36aae290e60462e47947fd643) Reviewed-on: https://weave-review.googlesource.com/3173
2016-04-07libweave: Remove unused local constantAlex Vakulenko
This causes on clang. Change-Id: I8bdffc52e9000c4033927555032b8b8294b80cfd Reviewed-on: https://weave-review.googlesource.com/3172 Reviewed-by: Alex Vakulenko <avakulenko@google.com>
2016-04-07add _ledflasher traits to the test_schema device.Surender Kodam
Change-Id: I79d3a9cd45461771b9129d2cea95e9c158b73dc2 Reviewed-on: https://weave-review.googlesource.com/3140 Reviewed-by: Alex Vakulenko <avakulenko@google.com>
2016-04-07Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'Alex Vakulenko
c93071c libweave: Always fetch commands from server, even if XMPP delivers JSON c507804 libweave: Remove backup polling (30 minute poll interval) eae016c clean up example/test_device clashes fcffce3 disable builtin rules fcf6b3e add standard "check" target 825c55c readme: document cross-compiling for end users c0c256c Add "make coverage" target to build code coverage. e2d68d4 Add general-use-and-purpose comment for Device interface. 39b96b6 create generic test device for multiple traits testing. 2fd3e55 libuweave: Fix break on Android toolchain Change-Id: I99d58082cd31aa997a52e0beab55a8b795581f00
2016-04-07libweave: Always fetch commands from server, even if XMPP delivers JSONAlex Vakulenko
XMPP notification may include the command payload in its message. If it it does, we normally don't go to the cloud server and fetch the current command queue. However if XMPP notification is missed, there is no easy way of obtaining the missed command. If we use the notification as a cue to pull the current command queue from the server, we would also pull any missed commands from earlier missed notifications. BUG: None Change-Id: I85f0c2e58df7c2e6d2ce1be034d3c367870f7f7a Reviewed-on: https://weave-review.googlesource.com/3170 Reviewed-by: Robert Ginda <rginda@google.com>
2016-04-07libweave: Remove backup polling (30 minute poll interval)Alex Vakulenko
The "just-in-case" polling every 30 minutes was a backup mechanism to guard against XMPP channel possibly missing command notifications. This hasn't been observed to be a major source of problems, so it was decided that this backup polling is no longer needed. BUG: 27878849 Change-Id: Ie8c816391e5bc5dfec0601fdd699f56eaee53efe Reviewed-on: https://weave-review.googlesource.com/3149 Reviewed-by: Alex Vakulenko <avakulenko@google.com>
2016-04-06clean up example/test_device clashesMike Frysinger
Move the duplicated libevhtp logic to third_party.mk so that multiple targets can rely on it being set up in the same way. Delete the duplicate example object rules from tests_schema.mk. We already include examples.mk before tests_schema.mk, so we know those rules are defined for us. We just need to depend on the output libs. Finally namespace the daemon variables in examples & tests_schema so they don't stop on each other in weird ways. Change-Id: I28fa152d8c8a30c84f7095e335e31a52889b5682 Reviewed-on: https://weave-review.googlesource.com/3152 Reviewed-by: Alex Vakulenko <avakulenko@google.com>
2016-04-06disable builtin rulesMike Frysinger
We define all rules/targets ourselves, so the builtin ones just get in our way and cause weirdness & slow things down. Disable them. Change-Id: I85075297322e3e0515141cc908a67065cbfe8e2c Reviewed-on: https://weave-review.googlesource.com/3151 Reviewed-by: Alex Vakulenko <avakulenko@google.com>
2016-04-06add standard "check" targetMike Frysinger
The wider build world uses `make check` to run all unittests. Add that target to our build too. Change-Id: I55f867e75ea8c01fd6a6e121d3f393403a8d9d34 Reviewed-on: https://weave-review.googlesource.com/3150 Reviewed-by: Alex Vakulenko <avakulenko@google.com>
2016-04-06readme: document cross-compiling for end usersMike Frysinger
Clarify the builtin cross-compiling support is meant for libweave developers only. BUG=b/26741388 Change-Id: I81c0d897d6b2f5d257ab9d50d2f96bf3d0a5448f Reviewed-on: https://weave-review.googlesource.com/3070 Reviewed-by: Alex Vakulenko <avakulenko@google.com>
2016-04-06Add "make coverage" target to build code coverage.Bryan Lewandowski
Change-Id: I8b00004e9ea5954ee7117cdaaaa2969090762570 Reviewed-on: https://weave-review.googlesource.com/3126 Reviewed-by: Mike Frysinger <vapier@google.com>
2016-04-05Add general-use-and-purpose comment for Device interface.Bryan Lewandowski
Change-Id: Id6c24bb037790e1d8fd328225b84e036fe70179e Reviewed-on: https://weave-review.googlesource.com/2860 Reviewed-by: Alex Vakulenko <avakulenko@google.com>
2016-04-04create generic test device for multiple traits testing.Surender Kodam
As part of testing multiple traits using libweave API, creating a test_schema which can hold multiple traits, and these multiple traits will be used in one single test device, and this test device will be used in test cases for test libweave API. Change-Id: Ia68e8aa9d43b927f41c7961e62d8ab78c46a85c8 Reviewed-on: https://weave-review.googlesource.com/3068 Reviewed-by: Alex Vakulenko <avakulenko@google.com>
2016-04-01libuweave: Fix break on Android toolchainAlex Vakulenko
Android toolchain defines "unix" to be 1 which breaks one function prototype in libuweave code. Changed the param name from "unix" to "unix_timestamp". Change-Id: Ic484d74aa3af1459af7cf6d15da4bc5b20226cf8 Reviewed-on: https://weave-review.googlesource.com/3120 Reviewed-by: Alex Vakulenko <avakulenko@google.com> (cherry picked from commit 2fd3e553fbbb93eefb4d09e5f516d5931bb47802) Reviewed-on: https://weave-review.googlesource.com/3121
2016-04-01libuweave: Fix break on Android toolchainAlex Vakulenko
Android toolchain defines "unix" to be 1 which breaks one function prototype in libuweave code. Changed the param name from "unix" to "unix_timestamp". Change-Id: Ic484d74aa3af1459af7cf6d15da4bc5b20226cf8 Reviewed-on: https://weave-review.googlesource.com/3120 Reviewed-by: Alex Vakulenko <avakulenko@google.com>
2016-04-01Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'Alex Vakulenko
This merge includes the following commits: dcc0dca libweave: Convert the blacklist trait into a standard one 5fe0ac0 examples: refactor README file 3127cb3 Tweak the README.md with respect to the repo subdirectories. 38a2aef libweave: Remove release() calls on scoped_ptr bf79a9e libweave: Port base/ changes from Chromium project b9bbdc6 libweave: Fix compile errors on Chrome OS 5c2870f libevhtp: build checked out copy 3e4d883 add integrated cross-compile & qemu support 7fb7903 examples/daemon/ledflasher: switch to onOff 0011064 readme: add more tips/links d70a965 gtest/gmock: build checked out copy 8bf4757 Fail setup/start if device already registered cd7a3a2 Add HTTPS port into TXT record 5ddd991 Return 'component' in command JSON 00180aa Avoid Revocation list overflow b506696 Bound j2000 timestamps into [0, <int32_t>::max()] interval e733c38 Take into account scope from /privet/v3/auth call 8b897af examples/daemon: fix ledflasher param names 978e712 Implement local_discovery_enabled setting e4b8ccf Remove ObserverList from cloud delegate 1c6837f Remove CloudDelegate::Observer::OnDeviceInfoChanged 63feef5 Fixed issues configuring devices with date before 2000. 86e8f63 Update READMEs to reflect cloud_id name in Cloud Services for deviceId Added git add <files> in README for Making Changes 80c65d2 VERISON: Initial commit on master - 1.4.1 98af48b Update macaroon lib fafbc5d Insert the description of the change. 5e94dc8 Applied clang-format b741d64 Fix crash when device in access point mode 0d3062e Implement minimalRole for state definitions c7fab18 Update _accessRevocationList trait b18bead Fixes to event_http_server for examples a07bbc7 Add provider::Wifi::GetConnectedSsid c96ee4e examples/lock: fix lock trait f7bfb6a examples/speaker: fix volume trait 2419a2a Update local auth info if server side information does not match b7e0996 Simplify few comparison helpers 497559b Moved previous comment to README file Change-Id: Ibd3ca55fb07b816b60489e458f5e905d260c683f
2016-04-01libweave: Convert the blacklist trait into a standard oneAlex Vakulenko
Now that revokation blacklist trait has been standardized, stop using a custom trait and rename it to match the name on the server. BUG: 26520268 Change-Id: I0555a600027796b5b4882f973f6455601d88c81e Reviewed-on: https://weave-review.googlesource.com/3107 Reviewed-by: Alex Vakulenko <avakulenko@google.com>
2016-03-31examples: refactor README fileJohan Euphrosine
- use weave console instead of oauth playground for sending commands - bootstrap provider documentation - fix markdown, prose and formating for the daemon readme Change-Id: Ie5c16b8ce68f856e4059158142ee984c2a131cdf Reviewed-on: https://weave-review.googlesource.com/2977 Reviewed-by: Dan Yu <dsyu@google.com> Reviewed-by: Alex Vakulenko <avakulenko@google.com>
2016-03-31Tweak the README.md with respect to the repo subdirectories.John McCullough
Change-Id: Ic883e7bebfaa20b6f62c5e734fed5e081031d2fc Reviewed-on: https://weave-review.googlesource.com/3100 Reviewed-by: John Mccullough <jmccullough@google.com>
2016-03-29libweave: Remove release() calls on scoped_ptrAlex Vakulenko
Now that scoped_ptr is just a type alias to std::unique_ptr, there is no need to do release()/aquire semantics to convert between scoped_ptr and unique_ptr. Also, replaced base::Value::DeepCopy with the safer smart-pointer-enabled base::Value::CreateDeepCopy. Change-Id: I6b7ed78b3fae6d42a68b7d73ae4d9d5eebf48922 Reviewed-on: https://weave-review.googlesource.com/3067 Reviewed-by: Robert Ginda <rginda@google.com>
2016-03-29libweave: Port base/ changes from Chromium projectAlex Vakulenko
Now this makes the state of base/ match libchrome's implementation on Brillo and Chrome OS. Change-Id: I1c1eb30d2669aeb58a77f332f8c69f130d00878c Reviewed-on: https://weave-review.googlesource.com/3065 Reviewed-by: Robert Ginda <rginda@google.com>
2016-03-29libweave: Fix compile errors on Chrome OSAlex Vakulenko
Need to include <algorithm> explicitly to use std::find and std::replace. On Android these included indirectly by some other library headers, but on Chrome OS they are not and this breaks the build. Change-Id: I590e00aaaa3796a6614147bd5acb404c2fe078d6 Reviewed-on: https://weave-review.googlesource.com/3063 Reviewed-by: Robert Ginda <rginda@google.com>
2016-03-24libevhtp: build checked out copyMike Frysinger
Now that libevhtp is part of the manifest, build it directly and store the results in out/. This also deletes references to third_party/{include,lib} as they're no longer needed. BUG=b/27820899 TEST+`make` still works, as does the unittests Change-Id: I6b1dd91cea0f152f8e79527e842add6a9d797a3c Reviewed-on: https://weave-review.googlesource.com/3001 Reviewed-by: Alex Vakulenko <avakulenko@google.com>
2016-03-22add integrated cross-compile & qemu supportMike Frysinger
This uses the existing CrOS toolchains & boards to cross-compile for arm and mipsel boards. It also includes qemu support for running tests. BUG=b/26741388 TEST=`make cross-arm all-libs` downloads & builds w/arm Change-Id: Ie974b1c3c2b61759e87f87bab535068a1c31a727 Reviewed-on: https://weave-review.googlesource.com/3000 Reviewed-by: Alex Vakulenko <avakulenko@google.com>
2016-03-22examples/daemon/ledflasher: switch to onOffJohan Euphrosine
Bug: 27550969 Change-Id: I3b9c940b52707cf8ee3523bf33f48c6f9e2bfc5b Reviewed-on: https://weave-review.googlesource.com/2976 Reviewed-by: Peng Ying <pying@google.com> Reviewed-by: Alex Vakulenko <avakulenko@google.com>
2016-03-17readme: add more tips/linksMike Frysinger
Change-Id: Ie4152539a64fe73cbf494809e2f271b5b00bfc85 Reviewed-on: https://weave-review.googlesource.com/2921 Reviewed-by: Alex Vakulenko <avakulenko@google.com>
2016-03-17gtest/gmock: build checked out copyMike Frysinger
Now that gtest/gmock are part of the manifest, build them directly and store the results in out/. BUG=b/27707648 TEST+`make` still works, as does the unittests Change-Id: I8a8235b4bc0100731168a44c6553859a5d85bbe1 Reviewed-on: https://weave-review.googlesource.com/2952 Reviewed-by: Alex Vakulenko <avakulenko@google.com>
2016-03-10Fail setup/start if device already registeredVitaly Buka
Previously device didn't check condition until wifi is switched. Bug we can detect the issue and reply to client in the same request. BUG: 27432528 Change-Id: I6564c47fba86671dbd59dc0ff70cfba3a25d60dc Reviewed-on: https://weave-review.googlesource.com/2890 Reviewed-by: Alex Vakulenko <avakulenko@google.com>
2016-03-10Add HTTPS port into TXT recordVitaly Buka
Example: https=123 BUG: 26687064 Change-Id: I8ebba527102eec2f916e6e9239ba07d026de7b7e Reviewed-on: https://weave-review.googlesource.com/2889 Reviewed-by: Alex Vakulenko <avakulenko@google.com>
2016-03-09Return 'component' in command JSONVitaly Buka
BUG: 26730593 Change-Id: I7661511669de35ff0e67d1da06fbd5ff5df510e0 Reviewed-on: https://weave-review.googlesource.com/2887 Reviewed-by: Alex Vakulenko <avakulenko@google.com>
2016-03-09Avoid Revocation list overflowVitaly Buka
When revocation list is full we remove two oldest entries and replace them with single entry that block all IDs older or equal to the second oldest entry. BUG: 27558454 Change-Id: I6b1a6c8f37fb3883605fb91f48beca7e60d71165 Reviewed-on: https://weave-review.googlesource.com/2881 Reviewed-by: Vitaly Buka <vitalybuka@google.com>
2016-03-09Bound j2000 timestamps into [0, <int32_t>::max()] intervalVitaly Buka
We use j2000 timestamps in base::Values and macaroon tokens. base::Values use int32_t and macaroon use uint32_t, so this interval should be safe. Change-Id: Ibcd7a8b8749ace62c561b2c03f3ccfdac2e74706 Reviewed-on: https://weave-review.googlesource.com/2882 Reviewed-by: Alex Vakulenko <avakulenko@google.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 13:04:47 +0000