X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=core%2Fchannel.go;h=eef59d046d2220c93ac9c9d874af53ac7a5cf12d;hb=67cea0df30f7ef348e265c9326f7a9f15ba26240;hp=1086c3639dbaf887f2a49bfdf8abc6cda671846d;hpb=c09ee3241377aae2530a73d48c4e20641d76d0ee;p=govpp.git

diff --git a/core/channel.go b/core/channel.go
index 1086c36..eef59d0 100644
--- a/core/channel.go
+++ b/core/channel.go
@@ -19,13 +19,12 @@ import (
 	"fmt"
 	"reflect"
 	"strings"
-	"sync/atomic"
 	"time"
 
 	"github.com/sirupsen/logrus"
 
-	"git.fd.io/govpp.git/adapter"
-	"git.fd.io/govpp.git/api"
+	"go.fd.io/govpp/adapter"
+	"go.fd.io/govpp/api"
 )
 
 var (
@@ -110,11 +109,9 @@ type Channel struct {
 	receiveReplyTimeout time.Duration // maximum time that we wait for receiver to consume reply
 }
 
-func (c *Connection) newChannel(reqChanBufSize, replyChanBufSize int) *Channel {
+func (c *Connection) newChannel(reqChanBufSize, replyChanBufSize int) (*Channel, error) {
 	// create new channel
-	chID := uint16(atomic.AddUint32(&c.maxChannelID, 1) & 0x7fff)
 	channel := &Channel{
-		id:                  chID,
 		conn:                c,
 		msgCodec:            c.codec,
 		msgIdentifier:       c,
@@ -126,10 +123,22 @@ func (c *Connection) newChannel(reqChanBufSize, replyChanBufSize int) *Channel {
 
 	// store API channel within the client
 	c.channelsLock.Lock()
-	c.channels[chID] = channel
+	if len(c.channels) >= 0x7fff {
+		return nil, errors.New("all channel IDs are used")
+	}
+	for {
+		c.nextChannelID++
+		chID := c.nextChannelID & 0x7fff
+		_, ok := c.channels[chID]
+		if !ok {
+			channel.id = chID
+			c.channels[chID] = channel
+			break
+		}
+	}
 	c.channelsLock.Unlock()
 
-	return channel
+	return channel, nil
 }
 
 func (ch *Channel) GetID() uint16 {