fix(ObjC): fix multiple issues on close conn

Signed-off-by: Sacha Froment <sfroment42@gmail.com>
berty · Dec 13, 2018 · 9f17286 · 9f17286
1 parent 11d4e85
commit 9f17286
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 18 deletions.
diff --git a/core/network/ble/ble.m b/core/network/ble/ble.m
@@ -58,7 +58,10 @@ void init() {
 }
 
 void addService() {
-  [peripheralManager addService:[BertyUtils sharedUtils].bertyService];
+  if ([BertyUtils sharedUtils].serviceAdded == NO) {
+    [BertyUtils sharedUtils].serviceAdded = YES;
+    [peripheralManager addService:[BertyUtils sharedUtils].bertyService];
+  }
 }
 
 void setMa(char *ma) {

diff --git a/core/network/ble/conn.go b/core/network/ble/conn.go
@@ -84,14 +84,6 @@ func BytesToConn(bleUUID string, b []byte) {
 }
 
 func ConnClosed(bleUUID string) {
-	if conn, ok := getConn(bleUUID); ok {
-		conns.Delete(bleUUID)
-		conn.closed = true
-		conn.sess.Close()
-	}
-}
-
-func ConnClose(bleUUID string) {
 	if conn, ok := getConn(bleUUID); ok {
 		conns.Delete(bleUUID)
 		conn.sess.Close()

diff --git a/core/network/ble/darwin.go b/core/network/ble/darwin.go
@@ -35,12 +35,6 @@ func setConnClosed(bleUUID *C.char) {
 	ConnClosed(goBleUUID)
 }
 
-//export callConnClose
-func callConnClose(bleUUID *C.char) {
-	goBleUUID := C.GoString(bleUUID)
-	ConnClose(goBleUUID)
-}
-
 func (b *Conn) IsClosed() bool {
 	val, err := b.rAddr.ValueForProtocol(PBle)
 	if err != nil {
@@ -54,9 +48,11 @@ func (b *Conn) IsClosed() bool {
 }
 
 func (b *Conn) Close() error {
-	logger().Debug("BLEConn Close")
-	b.closed = true
-	close(b.closer)
+	logger().Debug("BLEConn Close", zap.Bool("CLOSED ", b.closed))
+	if (b.closed != true) {
+		close(b.closer)
+		b.closed = true
+	}
 	_, err := b.rAddr.ValueForProtocol(PBle)
 	if err != nil {
 		logger().Debug("BLEConn close", zap.Error(err))
@@ -177,6 +173,7 @@ func (t *Transport) Dial(ctx context.Context, rAddr ma.Multiaddr, p peer.ID) (tp
 
 	if conn, ok := getConn(s); ok {
 		conn.closed = false
+		conn.closer = make(chan struct{}) 
 		return conn, nil
 	}
 	c := NewConn(t, t.MySelf.ID(), p, t.lAddr, rAddr, 0)

diff --git a/core/network/ble/java.go b/core/network/ble/java.go
@@ -36,6 +36,7 @@ func (t *Transport) Dial(ctx context.Context, rAddr ma.Multiaddr, p peer.ID) (tp
 
 	if conn, ok := getConn(s); ok {
 		conn.closed = false
+		conn.closer = make(chan struct{})
 		return conn, nil
 	}
 	c := NewConn(t, t.MySelf.ID(), p, t.lAddr, rAddr, 0)