From cf0942386b70f45850012b7f46ef701226a4f1e9 Mon Sep 17 00:00:00 2001
From: Stelios Bounanos <vcs@enotty.net>
Date: Fri, 29 Aug 2008 01:46:05 +0100
Subject: [PATCH] Upstream version 3.03AC

---
 ChangeLog           | 12 ++++++++++++
 configure.ac        |  2 +-
 src/misc/qrzlib.cxx |  8 ++++++++
 src/misc/socket.cxx | 15 ++++++++-------
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4cfe43ae..49835c07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 Change Log:
 
+3.03
+      1) Changes to socket server to correct shutdown process
+      2) Added event logging and an event viewer
+      
+3.02
+      1) Added hamlib interface for rig control
+      2) Improved rigCAT serial communications on Windows
+
+3.01
+      1) Compile switch changes for OS-X
+      2) Corrected serial port discovery on Windows
+      
 3.0   1) Added EXEC macro
       2) Added mousewheel over Macro buttons to move between macro button sets.
       3) Fixed bug in Olivia signal level display.
diff --git a/configure.ac b/configure.ac
index 4fca88dd..dd177ee1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl major and minor must be integers; patch may
 dnl contain other characters or be empty
 m4_define(FLDIGI_MAJOR, [3])
 m4_define(FLDIGI_MINOR, [0])
-m4_define(FLDIGI_PATCH, [3AB])
+m4_define(FLDIGI_PATCH, [3AC])
 
 AC_INIT([fldigi], FLDIGI_MAJOR.FLDIGI_MINOR[FLDIGI_PATCH], [w1hkj AT w1hkj DOT com])
 
diff --git a/src/misc/qrzlib.cxx b/src/misc/qrzlib.cxx
index 63ebfceb..ec3380b9 100644
--- a/src/misc/qrzlib.cxx
+++ b/src/misc/qrzlib.cxx
@@ -41,6 +41,13 @@ static char QRZdir[256] = "";
 
 static const char *QRZpath;
 static const char *QRZtry[] = { 
+#ifdef __CYGWIN__
+  "C:/CALLBK/", // look on C: drive first
+  "D:/CALLBK/", 
+  "E:/CALLBK/",
+  "F:/CALLBK/",
+  "G:/CALLBK/",
+#else
   "~/callbk/",
   "/cdrom/callbk/",
   "/mnt/cdrom/callbk/",  "/mnt/cdrom0/callbk/",  "/mnt/cdrom1/callbk/",
@@ -49,6 +56,7 @@ static const char *QRZtry[] = {
   "/cdrom/callbk/",
   "/mnt/cdrom/callbk/",  "/mnt/cdrom0/callbk/",  "/mnt/cdrom1/callbk/",
   "/media/cdrom/callbk/", "/media/cdrom0/callbk/", "/media/cdrom1/callbk/", 
+#endif
   0 };
 
 FILE *imagefile = NULL;
diff --git a/src/misc/socket.cxx b/src/misc/socket.cxx
index e665a9f4..3ab18c70 100644
--- a/src/misc/socket.cxx
+++ b/src/misc/socket.cxx
@@ -528,6 +528,13 @@ bool Socket::wait(int dir)
 ///
 void Socket::bind(void)
 {
+	int r;
+	if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &r, sizeof(r)) == -1)
+#ifndef NDEBUG
+		perror("setsockopt SO_REUSEADDR");
+#else
+		;
+#endif
 	if (::bind(sockfd, ainfo->ai_addr, ainfo->ai_addrlen) == -1)
 		throw SocketException(errno, "bind");
 }
@@ -542,13 +549,7 @@ void Socket::bind(void)
 ///
 Socket Socket::accept(void)
 {
-	int r = 1;
-	if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &r, sizeof(r)) == -1)
-#ifndef NDEBUG
-		perror("setsockopt SO_REUSEADDR");
-#else
-		;
-#endif
+	int r = -1;
 
 	listen(sockfd, SOMAXCONN);