locks + message helper rename

client/identity.go

@@ -48,8 +48,8 @@ func (id *Identity) InvitePeer(MyName string, ContactName string, MessageServerI
 		}
 	}
 	for _, i := range MessageServerIdxs {
-		srv := id.MessageServers.Servers[i].ServerData
-		myContactCard.PullServers = append(myContactCard.PullServers, &srv)
+		srv := &id.MessageServers.Servers[i].ServerData
+		myContactCard.PullServers = append(myContactCard.PullServers, srv)
 	}
 	myContactCard.Name = MyName
 	myContactCard.ContactPublicKey = peer.MyIdentity.Public

client/message.go

@@ -2,7 +2,7 @@ package client
 
 import "fmt"
 
-func MakeText(peer *Peer, text string, srv *InternalServer) ([]byte, error) {
+func ProcessOutboundTextMessage(peer *Peer, text string, srv *InternalServer) ([]byte, error) {
 	// Creating User message
 	usermessage, err := peer.BuildSimpleUserMessage([]byte(text))
 	if err != nil {
@@ -22,7 +22,7 @@ func MakeText(peer *Peer, text string, srv *InternalServer) ([]byte, error) {
 	packedMsg := peer.PackUserMessage(EncMsg, EncMsgSignature)
 
 	// Creating Server message for transporting the user message
-	toServerMessage, err := srv.BuildMessageSendingMessage(&packedMsg)
+	toServerMessage, err := srv.BuildMessageSendingMessage(packedMsg)
 	if err != nil {
 		return nil, err
 	}

client/peer.go

@@ -143,12 +143,12 @@ func (p *Peer) AsymDecryptMessage(Message []byte, Signature []byte) (DecryptedMe
 }
 
 // PackUserMessage will package the previously encrypted message for sending it to the peer in protobuff format
-func (p *Peer) PackUserMessage(message []byte, signature []byte) meowlib.PackedUserMessage {
+func (p *Peer) PackUserMessage(message []byte, signature []byte) *meowlib.PackedUserMessage {
 	var msg meowlib.PackedUserMessage
 	msg.Destination = p.Contact.LookupPublicKey
 	msg.Payload = message
 	msg.Signature = signature
-	return msg
+	return &msg
 }
 
 func (ints *InternalServer) UnPackUserMessage(protoPackedMessage []byte) (payload []byte, signature []byte, err error) {