4 files changed, 37 insertions, 0 deletions

diff --git a/gammu/emb/common/protocol/nokia/fbus2.c b/gammu/emb/common/protocol/nokia/fbus2.c
index 2b41f8b..967eaa4 100644
--- a/gammu/emb/common/protocol/nokia/fbus2.c
+++ b/gammu/emb/common/protocol/nokia/fbus2.c
@@ -1,54 +1,63 @@
 /* (c) 2002-2003 by Marcin Wiacek */
 /* based on some work from MyGnokii (www.mwiacek.com) */
 /* Based on some work from Gnokii (www.gnokii.org)
  * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot 
  * GNU GPL version 2 or later
  */
+/* Due to a problem in the source code management, the names of some of
+ * the authors have unfortunately been lost. We do not mean to belittle
+ * their efforts and hope they will contact us to see their names
+ * properly added to the Copyright notice above.
+ * Having published their contributions under the terms of the GNU
+ * General Public License (GPL) [version 2], the Copyright of these
+ * authors will remain respected by adhering to the license they chose
+ * to publish their code under.
+ */
 
 #include "../../gsmstate.h"
 
 #if defined(GSM_ENABLE_FBUS2) || defined(GSM_ENABLE_FBUS2IRDA) || defined(GSM_ENABLE_FBUS2DLR3) || defined(GSM_ENABLE_FBUS2BLUE) || defined(GSM_ENABLE_BLUEFBUS2) || defined(GSM_ENABLE_FBUS2DKU5) || defined(GSM_ENABLE_FBUS2PL2303)
 
 #include <stdio.h>
 #include <string.h>
 
 #include "../../gsmcomon.h"
 #include "fbus2.h"
 
         static GSM_Error FBUS2_WriteFrame(GSM_StateMachine *s,
                                           unsigned char *MsgBuffer,
                                           int           MsgLength,
                                           unsigned char MsgType)
 {
                 unsigned char     buffer2[FBUS2_MAX_TRANSMIT_LENGTH + 10];  
                 unsigned char     checksum=0;
                 int               i, len, sent;
 
                 buffer2[0] = FBUS2_FRAME_ID;
         if (s->ConnectionType==GCT_FBUS2IRDA) buffer2[0] = FBUS2_IRDA_FRAME_ID;
 
                 buffer2[1]      = FBUS2_DEVICE_PHONE;   //destination
                 buffer2[2]      = FBUS2_DEVICE_PC;      //source
                 buffer2[3]= MsgType;
                 buffer2[4]= MsgLength / 256;
                 buffer2[5]= MsgLength % 256;
 
         memcpy(buffer2 + 6, MsgBuffer, MsgLength);
         len = MsgLength + 6;
 
         /* Odd messages require additional 0x00 byte */
         if (MsgLength % 2) buffer2[len++] = 0x00;
 
                 checksum = 0;
         for (i = 0; i < len; i+=2) checksum ^= buffer2[i];
                 buffer2[len++] = checksum;
 
                 checksum = 0;
         for (i = 1; i < len; i+=2) checksum ^= buffer2[i];
                 buffer2[len++] = checksum;
 
         /* Sending to phone */
         sent=s->Device.Functions->WriteDevice(s,buffer2,len);
         if (sent!=len) return ERR_DEVICEWRITEERROR;
 
         return ERR_NONE;
@@ -100,96 +109,97 @@ static GSM_Error FBUS2_SendAck(GSM_StateMachine 	*s,
         buffer2[1] = MsgSequence;
 
         if (s->di.dl==DL_TEXT || s->di.dl==DL_TEXTALL ||
             s->di.dl==DL_TEXTDATE || s->di.dl==DL_TEXTALLDATE) {
                 smprintf(s,"[Sending Ack of type %02x, seq %x]\n",buffer2[0],buffer2[1]);
         }
 
         /* Sending to phone */
         return FBUS2_WriteFrame(s, buffer2, 2, FBUS2_ACK_BYTE);
 }
 
 static GSM_Error FBUS2_StateMachine(GSM_StateMachine *s, unsigned char rx_char)
 {
                 GSM_Protocol_FBUS2Data *d = &s->Protocol.Data.FBUS2;
                 unsigned char   frm_num, seq_num;
                 bool            correct = false;
 
         /* XOR the byte with the earlier checksum */
         d->Msg.CheckSum[d->Msg.Count & 1] ^= rx_char;
 
         if (d->MsgRXState == RX_GetMessage) {
                 d->Msg.Buffer[d->Msg.Count] = rx_char;
                 d->Msg.Count++;
 
                 /* This is not last byte in frame */
                 if (d->Msg.Count != d->Msg.Length+(d->Msg.Length%2)+2) return ERR_NONE;
 
                 /* Checksum is incorrect */
                 if (d->Msg.CheckSum[0] != d->Msg.CheckSum[1]) {
                         if (s->di.dl==DL_TEXT || s->di.dl==DL_TEXTALL || s->di.dl==DL_TEXTERROR ||
                             s->di.dl==DL_TEXTDATE || s->di.dl==DL_TEXTALLDATE || s->di.dl==DL_TEXTERRORDATE) {
                                         smprintf(s,"[ERROR: checksum]\n");
                         }
                         free(d->Msg.Buffer);
                                 d->Msg.Length   = 0;
                                 d->Msg.Buffer   = NULL;
 
                                 d->MsgRXState   = RX_Sync;
                         return ERR_NONE;
                 }
 
                 seq_num = d->Msg.Buffer[d->Msg.Length-1];
 
                 if (d->Msg.Type == FBUS2_ACK_BYTE) {
                         if (s->di.dl==DL_TEXT || s->di.dl==DL_TEXTALL ||
                             s->di.dl==DL_TEXTDATE || s->di.dl==DL_TEXTALLDATE) {
                                 smprintf(s, "[Received Ack of type %02x, seq %02x]\n",d->Msg.Buffer[0],seq_num);
                         }
+                        free(d->Msg.Buffer);
 
                         d->MsgRXState = RX_Sync;
                         return ERR_NONE;
                 }
 
                 frm_num = d->Msg.Buffer[d->Msg.Length-2];
 
                 if ((seq_num & 0x40) == 0x40) {
                                 d->FramesToGo   = frm_num;
                                 d->MultiMsg.Length= 0;
                                 d->MultiMsg.Type= d->Msg.Type;
                                 d->MultiMsg.Destination= d->Msg.Destination;
                                 d->MultiMsg.Source= d->Msg.Source;
                 }
 
                 if ((seq_num & 0x40) != 0x40 && d->FramesToGo != frm_num) {
                         if (s->di.dl==DL_TEXT || s->di.dl==DL_TEXTALL || s->di.dl==DL_TEXTERROR ||
                             s->di.dl==DL_TEXTDATE || s->di.dl==DL_TEXTALLDATE || s->di.dl==DL_TEXTERRORDATE) {
                                 smprintf(s, "[ERROR: Missed part of multiframe msg]\n");
                         }
 
                         free(d->Msg.Buffer);
                                 d->Msg.Length   = 0;
                                 d->Msg.Buffer   = NULL;
 
                                 d->MsgRXState   = RX_Sync;
                         return ERR_NONE;
                 }
 
                 if ((seq_num & 0x40) != 0x40 && d->Msg.Type != d->MultiMsg.Type) {
                         if (s->di.dl==DL_TEXT || s->di.dl==DL_TEXTALL || s->di.dl==DL_TEXTERROR ||
                             s->di.dl==DL_TEXTDATE || s->di.dl==DL_TEXTALLDATE || s->di.dl==DL_TEXTERRORDATE) {
                                 smprintf(s, "[ERROR: Multiframe msg in multiframe msg]\n");
                         }
 
                         free(d->Msg.Buffer);
                                 d->Msg.Length   = 0;
                                 d->Msg.Buffer   = NULL;
         
                                 d->MsgRXState   = RX_Sync;
                         return ERR_NONE;
                 }
 
                 if (d->MultiMsg.BufferUsed < d->MultiMsg.Length+d->Msg.Length-2) {
                                 d->MultiMsg.BufferUsed = d->MultiMsg.Length+d->Msg.Length-2;
                                 d->MultiMsg.Buffer = (unsigned char *)realloc(d->MultiMsg.Buffer,d->MultiMsg.BufferUsed);
                 }
                 memcpy(d->MultiMsg.Buffer+d->MultiMsg.Length,d->Msg.Buffer,d->Msg.Length-2);
diff --git a/gammu/emb/common/protocol/nokia/fbus2.h b/gammu/emb/common/protocol/nokia/fbus2.h
index 8dbcb07..3d31006 100644
--- a/gammu/emb/common/protocol/nokia/fbus2.h
+++ b/gammu/emb/common/protocol/nokia/fbus2.h
@@ -1,42 +1,51 @@
 /* (c) 2002-2003 by Marcin Wiacek */
 /* based on some work from MyGnokii (www.mwiacek.com) */
 /* Based on some work from Gnokii (www.gnokii.org)
  * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot 
  * GNU GPL version 2 or later
  */
+/* Due to a problem in the source code management, the names of some of
+ * the authors have unfortunately been lost. We do not mean to belittle
+ * their efforts and hope they will contact us to see their names
+ * properly added to the Copyright notice above.
+ * Having published their contributions under the terms of the GNU
+ * General Public License (GPL) [version 2], the Copyright of these
+ * authors will remain respected by adhering to the license they chose
+ * to publish their code under.
+ */
 
 #ifndef fbus2_h
 #define fbus2_h
 
 #include "../protocol.h"
 
         #define FBUS2_FRAME_ID       0x1e
         #define FBUS2_IRDA_FRAME_ID    0x1c
         #define FBUS2_DEVICE_PHONE   0x00 /* Nokia mobile phone */
         #define FBUS2_DEVICE_PC      0x0c /* Our PC */
         #define FBUS2_ACK_BYTE       0x7f /* Acknowledge of the received frame */
 
 #define FBUS2_MAX_TRANSMIT_LENGTH 120
 
 typedef struct {
                 int             MsgSequenceNumber;
                 int             MsgRXState;
                 int             FramesToGo;
                 GSM_Protocol_MessageMultiMsg;
                 GSM_Protocol_MessageMsg;
 } GSM_Protocol_FBUS2Data;
 
 #ifndef GSM_USED_SERIALDEVICE
 #  define GSM_USED_SERIALDEVICE
 #endif
 #if defined(GSM_ENABLE_BLUEFBUS2)
 #  ifndef GSM_USED_BLUETOOTHDEVICE
 #    define GSM_USED_BLUETOOTHDEVICE
 #  endif
 #endif
 
 #endif
 
 /* How should editor hadle tabs in this file? Add editor commands here.
  * vim: noexpandtab sw=8 ts=8 sts=8:
  */
diff --git a/gammu/emb/common/protocol/nokia/phonet.c b/gammu/emb/common/protocol/nokia/phonet.c
index db5bd72..495a1bf 100644
--- a/gammu/emb/common/protocol/nokia/phonet.c
+++ b/gammu/emb/common/protocol/nokia/phonet.c
@@ -1,53 +1,62 @@
 /* (c) 2002-2003 by Marcin Wiacek */
 /* Based on some work from Gnokii (www.gnokii.org)
  * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot 
  * GNU GPL version 2 or later
  */
+/* Due to a problem in the source code management, the names of some of
+ * the authors have unfortunately been lost. We do not mean to belittle
+ * their efforts and hope they will contact us to see their names
+ * properly added to the Copyright notice above.
+ * Having published their contributions under the terms of the GNU
+ * General Public License (GPL) [version 2], the Copyright of these
+ * authors will remain respected by adhering to the license they chose
+ * to publish their code under.
+ */
 
 #include "../../gsmstate.h"
 
 #if defined(GSM_ENABLE_IRDA) || defined(GSM_ENABLE_PHONETBLUE) || defined(GSM_ENABLE_BLUEPHONET)
 
 #include <stdio.h>
 #include <string.h>
 
 #include "../../gsmcomon.h"
 #include "phonet.h"
 
         static GSM_Error PHONET_WriteMessage (GSM_StateMachine *s,
                                               unsigned char *MsgBuffer,
                                               int       MsgLength,
                                               unsigned char MsgType)
 {
                 unsigned char   *buffer2; 
                 int             sent;
 
         GSM_DumpMessageLevel3(s, MsgBuffer, MsgLength, MsgType);
 
         buffer2 = (unsigned char *)malloc(MsgLength + 6);
 
         buffer2[0] = PHONET_FRAME_ID,
                 buffer2[1] = PHONET_DEVICE_PHONE;       //destination
                 buffer2[2] = PHONET_DEVICE_PC;          //source
         
         if (s->ConnectionType==GCT_PHONETBLUE || s->ConnectionType==GCT_BLUEPHONET) {
                 buffer2[0] = PHONET_BLUE_FRAME_ID;
                         buffer2[1] = PHONET_DEVICE_PHONE;//destination
                         buffer2[2] = PHONET_BLUE_DEVICE_PC;//source
         }
 
         buffer2[3] = MsgType;
         buffer2[4] = MsgLength / 256;
         buffer2[5] = MsgLength % 256;
 
         memcpy(buffer2 + 6, MsgBuffer, MsgLength);
 
         GSM_DumpMessageLevel2(s, buffer2+6, MsgLength, MsgType);
 
         /* Sending to phone */
         sent = s->Device.Functions->WriteDevice(s,buffer2,MsgLength+6);
 
         free(buffer2);
 
         if (sent!=MsgLength+6) return ERR_DEVICEWRITEERROR;
         return ERR_NONE;
diff --git a/gammu/emb/common/protocol/nokia/phonet.h b/gammu/emb/common/protocol/nokia/phonet.h
index e750bbd..7626c23 100644
--- a/gammu/emb/common/protocol/nokia/phonet.h
+++ b/gammu/emb/common/protocol/nokia/phonet.h
@@ -1,38 +1,47 @@
 /* (c) 2002-2003 by Marcin Wiacek */
 /* Based on some work from Gnokii (www.gnokii.org)
  * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot 
  * GNU GPL version 2 or later
  */
+/* Due to a problem in the source code management, the names of some of
+ * the authors have unfortunately been lost. We do not mean to belittle
+ * their efforts and hope they will contact us to see their names
+ * properly added to the Copyright notice above.
+ * Having published their contributions under the terms of the GNU
+ * General Public License (GPL) [version 2], the Copyright of these
+ * authors will remain respected by adhering to the license they chose
+ * to publish their code under.
+ */
 
 #ifndef PHONET_h
 #define PHONET_h
 
 #include "../protocol.h"
 
         #define PHONET_FRAME_ID      0x14
         #define PHONET_BLUE_FRAME_ID0x19
         #define PHONET_DEVICE_PHONE   0x00 /* Nokia mobile phone */
         #define PHONET_DEVICE_PC      0x0c /* Our PC */
 #define PHONET_BLUE_DEVICE_PC   0x10 /* Our PC */
 
 typedef struct {
                 int             MsgRXState;
                 GSM_Protocol_MessageMsg;
 } GSM_Protocol_PHONETData;
 
 #if defined(GSM_ENABLE_IRDAPHONET)
 #  ifndef GSM_USED_IRDADEVICE
 #    define GSM_USED_IRDADEVICE
 #  endif
 #endif
 #if defined(GSM_ENABLE_BLUEPHONET)
 #  ifndef GSM_USED_BLUETOOTHDEVICE
 #    define GSM_USED_BLUETOOTHDEVICE
 #  endif
 #endif
 
 #endif
 
 /* How should editor hadle tabs in this file? Add editor commands here.
  * vim: noexpandtab sw=8 ts=8 sts=8:
  */