Changeset 154 for trunk

Timestamp:

06/04/07 21:47:49 (18 months ago)

Author:

zany

Message:

win32 fixes

Location:

trunk

Files:

• apps/obexftp.c (modified) (2 diffs)
• apps/obexftp_sdp.c (modified) (7 diffs)
• apps/obexftpd.c (modified) (7 diffs)
• bfb/bfb.c (modified) (1 diff)
• multicobex/multi_cobex.c (modified) (1 diff)
• obexftp/client.c (modified) (2 diffs)

trunk/apps/obexftp.c

@@ -41 +41 @@
 void DEBUG(unsigned int n, ...) { }
 void DUMPBUFFER(unsigned int n, char *label, char *msg) { }
+#endif /* _WIN32 */
+
+#ifdef _WIN32
+#define strcasestr strstr
 #endif /* _WIN32 */
 
@@ -510 +514 @@
 #ifdef HAVE_USB
                 case 'u':
+#ifndef _WIN32
                         if (geteuid() != 0)
                                 fprintf(stderr, "If USB doesn't work setup permissions in udev or run as superuser.\n");
+#endif
                         transport = OBEX_TRANS_USB;
                         device = NULL;

trunk/apps/obexftp_sdp.c

@@ -31 +31 @@
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
+#ifdef _WIN32
+#include <winsock2.h>
+#else
+#include <sys/socket.h>
+#endif
+
+#ifndef _WIN32
 #include <syslog.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+#define log_err(format, args...) syslog(LOG_ERR, format, ##args)
+#define log_err_prefix "ObexFTPd: "
+#else
+#include <stdio.h>
+#define log_err(format, args...) fprintf(stderr, format, ##args)
+#define log_err_prefix ""
+#endif
 
 #ifdef HAVE_SDPLIB
@@ -53 +66 @@
 {
         if (record && sdp_record_unregister(session, record))
-                syslog(LOG_ERR, "Service record unregistration failed.");
+                log_err("Service record unregistration failed.");
 
         sdp_close(session);
@@ -72 +85 @@
         session = sdp_connect(BDADDR_ANY, BDADDR_LOCAL, 0);
         if (!session) {
-                syslog(LOG_ERR, "Failed to connect to the local SDP server. %s(%d)", 
+                log_err("Failed to connect to the local SDP server. %s(%d)", 
                                 strerror(errno), errno);
                 return -1;
@@ -79 +92 @@
         record = sdp_record_alloc();
         if (!record) {
-                syslog(LOG_ERR, "Failed to allocate service record %s(%d)", 
+                log_err("Failed to allocate service record %s(%d)", 
                                 strerror(errno), errno);
                 sdp_close(session);
@@ -132 +145 @@
         status = sdp_device_record_register(session, BDADDR_ANY, record, 0);
         if (status) {
-                syslog(LOG_ERR, "SDP registration failed.");
+                log_err("SDP registration failed.");
                 sdp_record_free(record); record = NULL;
                 sdp_close(session);
@@ -162 +175 @@
         s = sdp_connect(src, dst, 0);
         if (!s) {
-                syslog(LOG_ERR, "Failed to connect to the SDP server. %s(%d)",
+                log_err("Failed to connect to the SDP server. %s(%d)",
                                 strerror(errno), errno);
                 return 0;
@@ -187 +200 @@
 int obexftp_sdp_register(void)
 {
-        syslog(LOG_ERR, "SDP not supported.");
+        log_err("SDP not supported.");
         return -1;
 }

trunk/apps/obexftpd.c

@@ -37 +37 @@
 #include <errno.h>
 #include <sys/types.h>
+#include <fcntl.h>
+#ifdef _WIN32
+#include <winsock2.h>
+#define S_IRGRP 0
+#define S_IROTH 0
+#define S_IWGRP 0
+#define S_IWOTH 0
+#define S_IXGRP 0
+#define S_IXOTH 0
+#define sleep(n)        Sleep((n) * 1000)
+#define mkdir(dir,mode) _mkdir(dir)
+#define lstat stat
+#else
 #include <netinet/in.h>
-#include <fcntl.h>
 #include <sys/socket.h>
 #include <netdb.h>
+#endif
 
 /* just until there is a server layer in obexftp */
@@ -61 +74 @@
 
 
+#ifdef HAVE_BLUETOOTH
 static bdaddr_t *bt_src = NULL;
+#endif
 static char *device = NULL;
 static int channel = 10; /* OBEX_PUSH_HANDLE */
@@ -75 +90 @@
 int verbose = 0;
 
-static in_addr_t inaddr_any = INADDR_ANY;
+// this whole thing needs a review:
 static int parsehostport(const char *name, char **host, int *port) {
         struct hostent *e;
@@ -89 +104 @@
         }
 
-        inaddr_any = INADDR_ANY;
-        *host = (char *)&inaddr_any;
+        *host = "0.0.0.0";
 
         if (sscanf(p, "%hhu.%hhu.%hhu.%hhu", &n[0], &n[1], &n[2], &n[3]) == 4) {
-                inaddr_any = (in_addr_t) (*n);
+                *host = strdup(p);
         } else {
                 e = gethostbyname(p);
                 if (e) {
-                        *host = e->h_addr_list[0];
+                        *host = e->h_addr_list[0]; // inet_ntoa needed!
                 }
         }
@@ -859 +873 @@
                 saddr.sin_family = AF_INET;
                 saddr.sin_port = htons(channel);
-                saddr.sin_addr.s_addr = (in_addr_t)*device; //INADDR_ANY;
+#ifdef _WIN32
+                saddr.sin_addr.s_addr = inet_addr(device);
+#else
+                (void) inet_aton(device, &saddr.sin_addr);
+#endif
                 //InOBEX_ServerRegister(handle); /* always port 650 */
                 if (0 > OBEX_ServerRegister(handle, (struct sockaddr *)&saddr, sizeof(saddr))) {
@@ -866 +884 @@
                 }
                 break;
+#ifdef HAVE_BLUETOOTH
         case OBEX_TRANS_BLUETOOTH:
                 if (0 > BtOBEX_ServerRegister(handle, bt_src, channel)) {
@@ -872 +891 @@
                 }
                 break;
+#endif
         case OBEX_TRANS_IRDA:
                 if (0 > IrOBEX_ServerRegister(handle, "")) {

trunk/bfb/bfb.c

@@ -39 +39 @@
 /* htons */
 #ifdef _WIN32
-#include <winsock.h>
+#include <winsock2.h>
 #else
 #include <netinet/in.h>

trunk/multicobex/multi_cobex.c

@@ -46 +46 @@
 #include <windows.h>
 #include <stdlib.h>
+#define sleep(t) Sleep((t) * 1000)
+#define usleep(t) Sleep((t) < 500 ? 1 : ((t) + 500) / 1000);
 #else
 #include <sys/ioctl.h>

trunk/obexftp/client.c

@@ -39 +39 @@
 
 #ifdef _WIN32
-#include <winsock.h>
+#include <winsock2.h>
 #define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT
 #define S_IRGRP 0
@@ -545 +545 @@
                         break;
                 }
-                if (inet_aton(device, &peer.sin_addr)) {
+#ifdef _WIN32
+                peer.sin_addr.s_addr = inet_addr(device);
+                ret = (peer.sin_addr.s_addr == INADDR_NONE) ? 0 : 1;
+#else
+                ret = inet_aton(device, &peer.sin_addr);
+#endif
+                if (ret) {
                         peer.sin_family = AF_INET;
                         peer.sin_port = htons(port); /* overridden with OBEX_PORT 650 anyhow */