You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2017/07/12 22:38:09 UTC
[mynewt-newtmgr] branch master updated (2518ace -> d7295d8)
This is an automated email from the ASF dual-hosted git repository.
ccollins pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-newtmgr.git.
from 2518ace newtmgr revendor
new 4ae7186 nmxact - Stop OMP dispatcher on requested close.
new d7295d8 newtmgr revendor
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
newtmgr/Godeps/Godeps.json | 48 +++++++++++-----------
.../newtmgr/nmxact/nmble/ble_oic_sesn.go | 5 ++-
nmxact/nmble/ble_oic_sesn.go | 5 ++-
3 files changed, 32 insertions(+), 26 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@mynewt.apache.org" <co...@mynewt.apache.org>'].
[mynewt-newtmgr] 01/02: nmxact - Stop OMP dispatcher on requested
close.
Posted by cc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ccollins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-newtmgr.git
commit 4ae718674223ff69f47fbfe0b6304ac82d6bae8a
Author: Christopher Collins <cc...@apache.org>
AuthorDate: Wed Jul 12 15:36:46 2017 -0700
nmxact - Stop OMP dispatcher on requested close.
---
nmxact/nmble/ble_oic_sesn.go | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/nmxact/nmble/ble_oic_sesn.go b/nmxact/nmble/ble_oic_sesn.go
index 2c4c6de..d93ab63 100644
--- a/nmxact/nmble/ble_oic_sesn.go
+++ b/nmxact/nmble/ble_oic_sesn.go
@@ -179,8 +179,11 @@ func (bos *BleOicSesn) onDisconnect(dt BleFsmDisconnectType, peer BleDev,
// disconnect was unsolicited and the session was fully open. If the
// session wasn't fully open, the dispatcher will get stopped when the fsm
// start function returns an error (right after this function returns).
- if dt == FSM_DISCONNECT_TYPE_OPENED {
+ if dt == FSM_DISCONNECT_TYPE_OPENED || dt == FSM_DISCONNECT_TYPE_REQUESTED {
bos.d.Stop()
+ }
+
+ if dt == FSM_DISCONNECT_TYPE_OPENED {
if bos.onCloseCb != nil {
bos.onCloseCb(bos, err)
}
--
To stop receiving notification emails like this one, please contact
"commits@mynewt.apache.org" <co...@mynewt.apache.org>.
[mynewt-newtmgr] 02/02: newtmgr revendor
Posted by cc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ccollins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-newtmgr.git
commit d7295d8222e62ec0dd66f9b8123fbeee2b86f40a
Author: Christopher Collins <cc...@apache.org>
AuthorDate: Wed Jul 12 15:16:13 2017 -0700
newtmgr revendor
---
newtmgr/Godeps/Godeps.json | 48 +++++++++++-----------
.../newtmgr/nmxact/nmble/ble_oic_sesn.go | 5 ++-
2 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/newtmgr/Godeps/Godeps.json b/newtmgr/Godeps/Godeps.json
index 0f2ac7e..b550138 100644
--- a/newtmgr/Godeps/Godeps.json
+++ b/newtmgr/Godeps/Godeps.json
@@ -126,63 +126,63 @@
},
{
"ImportPath": "mynewt.apache.org/newtmgr/nmxact/bledefs",
- "Comment": "mynewt_0_9_0_tag-542-gfe87990",
- "Rev": "fe87990877a516c6466009afb2da415f74c98f39"
+ "Comment": "mynewt_0_9_0_tag-543-g29157f2",
+ "Rev": "29157f2faf564233a6fb6922b1f037493ccd7bf4"
},
{
"ImportPath": "mynewt.apache.org/newtmgr/nmxact/nmble",
- "Comment": "mynewt_0_9_0_tag-542-gfe87990",
- "Rev": "fe87990877a516c6466009afb2da415f74c98f39"
+ "Comment": "mynewt_0_9_0_tag-543-g29157f2",
+ "Rev": "29157f2faf564233a6fb6922b1f037493ccd7bf4"
},
{
"ImportPath": "mynewt.apache.org/newtmgr/nmxact/nmp",
- "Comment": "mynewt_0_9_0_tag-542-gfe87990",
- "Rev": "fe87990877a516c6466009afb2da415f74c98f39"
+ "Comment": "mynewt_0_9_0_tag-543-g29157f2",
+ "Rev": "29157f2faf564233a6fb6922b1f037493ccd7bf4"
},
{
"ImportPath": "mynewt.apache.org/newtmgr/nmxact/nmserial",
- "Comment": "mynewt_0_9_0_tag-542-gfe87990",
- "Rev": "fe87990877a516c6466009afb2da415f74c98f39"
+ "Comment": "mynewt_0_9_0_tag-543-g29157f2",
+ "Rev": "29157f2faf564233a6fb6922b1f037493ccd7bf4"
},
{
"ImportPath": "mynewt.apache.org/newtmgr/nmxact/nmxutil",
- "Comment": "mynewt_0_9_0_tag-542-gfe87990",
- "Rev": "fe87990877a516c6466009afb2da415f74c98f39"
+ "Comment": "mynewt_0_9_0_tag-543-g29157f2",
+ "Rev": "29157f2faf564233a6fb6922b1f037493ccd7bf4"
},
{
"ImportPath": "mynewt.apache.org/newtmgr/nmxact/oic",
- "Comment": "mynewt_0_9_0_tag-542-gfe87990",
- "Rev": "fe87990877a516c6466009afb2da415f74c98f39"
+ "Comment": "mynewt_0_9_0_tag-543-g29157f2",
+ "Rev": "29157f2faf564233a6fb6922b1f037493ccd7bf4"
},
{
"ImportPath": "mynewt.apache.org/newtmgr/nmxact/omp",
- "Comment": "mynewt_0_9_0_tag-542-gfe87990",
- "Rev": "fe87990877a516c6466009afb2da415f74c98f39"
+ "Comment": "mynewt_0_9_0_tag-543-g29157f2",
+ "Rev": "29157f2faf564233a6fb6922b1f037493ccd7bf4"
},
{
"ImportPath": "mynewt.apache.org/newtmgr/nmxact/scan",
- "Comment": "mynewt_0_9_0_tag-542-gfe87990",
- "Rev": "fe87990877a516c6466009afb2da415f74c98f39"
+ "Comment": "mynewt_0_9_0_tag-543-g29157f2",
+ "Rev": "29157f2faf564233a6fb6922b1f037493ccd7bf4"
},
{
"ImportPath": "mynewt.apache.org/newtmgr/nmxact/sesn",
- "Comment": "mynewt_0_9_0_tag-542-gfe87990",
- "Rev": "fe87990877a516c6466009afb2da415f74c98f39"
+ "Comment": "mynewt_0_9_0_tag-543-g29157f2",
+ "Rev": "29157f2faf564233a6fb6922b1f037493ccd7bf4"
},
{
"ImportPath": "mynewt.apache.org/newtmgr/nmxact/udp",
- "Comment": "mynewt_0_9_0_tag-542-gfe87990",
- "Rev": "fe87990877a516c6466009afb2da415f74c98f39"
+ "Comment": "mynewt_0_9_0_tag-543-g29157f2",
+ "Rev": "29157f2faf564233a6fb6922b1f037493ccd7bf4"
},
{
"ImportPath": "mynewt.apache.org/newtmgr/nmxact/xact",
- "Comment": "mynewt_0_9_0_tag-542-gfe87990",
- "Rev": "fe87990877a516c6466009afb2da415f74c98f39"
+ "Comment": "mynewt_0_9_0_tag-543-g29157f2",
+ "Rev": "29157f2faf564233a6fb6922b1f037493ccd7bf4"
},
{
"ImportPath": "mynewt.apache.org/newtmgr/nmxact/xport",
- "Comment": "mynewt_0_9_0_tag-542-gfe87990",
- "Rev": "fe87990877a516c6466009afb2da415f74c98f39"
+ "Comment": "mynewt_0_9_0_tag-543-g29157f2",
+ "Rev": "29157f2faf564233a6fb6922b1f037493ccd7bf4"
}
]
}
diff --git a/newtmgr/vendor/mynewt.apache.org/newtmgr/nmxact/nmble/ble_oic_sesn.go b/newtmgr/vendor/mynewt.apache.org/newtmgr/nmxact/nmble/ble_oic_sesn.go
index 2c4c6de..d93ab63 100644
--- a/newtmgr/vendor/mynewt.apache.org/newtmgr/nmxact/nmble/ble_oic_sesn.go
+++ b/newtmgr/vendor/mynewt.apache.org/newtmgr/nmxact/nmble/ble_oic_sesn.go
@@ -179,8 +179,11 @@ func (bos *BleOicSesn) onDisconnect(dt BleFsmDisconnectType, peer BleDev,
// disconnect was unsolicited and the session was fully open. If the
// session wasn't fully open, the dispatcher will get stopped when the fsm
// start function returns an error (right after this function returns).
- if dt == FSM_DISCONNECT_TYPE_OPENED {
+ if dt == FSM_DISCONNECT_TYPE_OPENED || dt == FSM_DISCONNECT_TYPE_REQUESTED {
bos.d.Stop()
+ }
+
+ if dt == FSM_DISCONNECT_TYPE_OPENED {
if bos.onCloseCb != nil {
bos.onCloseCb(bos, err)
}
--
To stop receiving notification emails like this one, please contact
"commits@mynewt.apache.org" <co...@mynewt.apache.org>.