Menu
▾
▴
[cadcdev-svn-commits] SF.net SVN: cadcdev: [487] tiki
|
From: <at...@us...> - 2007-08-23 00:02:00
|
Revision: 487
http://cadcdev.svn.sourceforge.net/cadcdev/?rev=487&view=rev
Author: atani
Date: 2007-08-22 17:01:53 -0700 (Wed, 22 Aug 2007)
Log Message:
-----------
nds and osx Tiki::Net support
Modified Paths:
--------------
tiki/include/Tiki/net/tcpsocket.h
tiki/include/Tiki/net.h
tiki/nds/Makefile
tiki/osx/Tiki.xcodeproj/project.pbxproj
tiki/osx/src/init_shutdown.cpp
tiki/osx/src/platnet.cpp
tiki/sdl/src/platnet.cpp
tiki/src/net/address.cpp
tiki/src/net/tcpserversocket.cpp
tiki/src/net/tcpsocket.cpp
Added Paths:
-----------
tiki/nds/include/Tiki/platnet.h
tiki/nds/src/platnet.cpp
Modified: tiki/include/Tiki/net/tcpsocket.h
===================================================================
--- tiki/include/Tiki/net/tcpsocket.h 2007-08-22 20:47:44 UTC (rev 486)
+++ tiki/include/Tiki/net/tcpsocket.h 2007-08-23 00:01:53 UTC (rev 487)
@@ -25,11 +25,12 @@
public:
#ifndef INVALID_SOCKET
- enum {
- INVALID_SOCKET = -1,
- SOCKET_ERROR = -1
- };
+#define INVALID_SOCKET -1
#endif
+
+#ifndef SOCKET_ERROR
+#define SOCKET_ERROR -1
+#endif
TCPSocket() : Socket(), m_open(false) {};
TCPSocket(RefPtr<Address> address) : Socket(address), m_open(false) {};
#if TIKI_PLAT == TIKI_WIN32
Modified: tiki/include/Tiki/net.h
===================================================================
--- tiki/include/Tiki/net.h 2007-08-22 20:47:44 UTC (rev 486)
+++ tiki/include/Tiki/net.h 2007-08-23 00:01:53 UTC (rev 487)
@@ -14,6 +14,9 @@
void init();
void shutdown();
+bool connect();
+bool isConnected();
+void disconnect();
} // namespace Net
Modified: tiki/nds/Makefile
===================================================================
--- tiki/nds/Makefile 2007-08-22 20:47:44 UTC (rev 486)
+++ tiki/nds/Makefile 2007-08-23 00:01:53 UTC (rev 487)
@@ -10,6 +10,8 @@
BASE_IMAGE_OBJ=$(patsubst %.cpp,%.o,$(wildcard ../src/image/*.cpp))
BASE_MATH_OBJ=$(patsubst %.cpp,%.o,$(wildcard ../src/math/*.cpp))
BASE_THREAD_OBJ=$(patsubst %.cpp,%.o,$(wildcard ../src/thread/*.cpp))
+BASE_NET_OBJ=$(patsubst %.cpp,%.o,$(wildcard ../src/net/*.cpp))
+BASE_NET_OBJ+=$(patsubst %.cpp,%.o,$(wildcard ../src/net/http/*.cpp))
JPEG_OBJ=$(patsubst %.c,%.o,$(wildcard ../3rdparty/libjpeg/*.c))
PNG_OBJ=$(patsubst %.c,%.o,$(wildcard ../3rdparty/libpng/*.c))
@@ -39,7 +41,7 @@
BASE_OBJS = $(BASE_AUDIO_OBJ) $(BASE_BASE_OBJ) $(BASE_GL_OBJ) \
$(BASE_HID_OBJ) $(BASE_IMAGE_OBJ) $(BASE_MATH_OBJ) \
- $(BASE_THREAD_OBJ)
+ $(BASE_THREAD_OBJ) $(BASE_NET_OBJ)
THIRD_PARTY_OBJS = $(JPEG_OBJ) $(OGG_OBJ) $(VORBIS_OBJ) $(PNG_OBJ) $(ZLIB_OBJ)
@@ -56,6 +58,10 @@
examples:
$(MAKE) TIKI_PLAT=nds TIKI_DIR=$(CURDIR)/../ -C$(CURDIR)/../examples/TikiTest
$(MAKE) TIKI_PLAT=nds TIKI_DIR=$(CURDIR)/../ -C$(CURDIR)/../examples/console/TikiSnake
+ $(MAKE) TIKI_PLAT=nds TIKI_DIR=$(CURDIR)/../ -C$(CURDIR)/../examples/net/basic
+ $(MAKE) TIKI_PLAT=nds TIKI_DIR=$(CURDIR)/../ -C$(CURDIR)/../examples/net/chat
+ $(MAKE) TIKI_PLAT=nds TIKI_DIR=$(CURDIR)/../ -C$(CURDIR)/../examples/net/chatd
+ $(MAKE) TIKI_PLAT=nds TIKI_DIR=$(CURDIR)/../ -C$(CURDIR)/../examples/net/httpclient
package:
zip -9r ../dist/$(SVN_VERSION)/tiki-$(SVN_VERSION)-nds.zip \
Added: tiki/nds/include/Tiki/platnet.h
===================================================================
--- tiki/nds/include/Tiki/platnet.h (rev 0)
+++ tiki/nds/include/Tiki/platnet.h 2007-08-23 00:01:53 UTC (rev 487)
@@ -0,0 +1,14 @@
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+
+#include <nds.h>
+#include <dswifi9.h>
+
Added: tiki/nds/src/platnet.cpp
===================================================================
--- tiki/nds/src/platnet.cpp (rev 0)
+++ tiki/nds/src/platnet.cpp 2007-08-23 00:01:53 UTC (rev 487)
@@ -0,0 +1,50 @@
+/*
+ Tiki
+
+ platnet.cpp
+
+ Copyright (C)2007 Atani Software
+*/
+
+#include "Tiki/tiki.h"
+#include "Tiki/net.h"
+
+namespace Tiki {
+
+namespace Net {
+
+void init() {
+}
+
+void shutdown() {
+}
+
+bool connect() {
+ if(!isConnected()) {
+ Wifi_AutoConnect();
+ while(1) {
+ switch(Wifi_AssocStatus()) {
+ case ASSOCSTATUS_ASSOCIATED:
+ return true;
+ case ASSOCSTATUS_CANNOTCONNECT:
+ return false;
+ }
+ }
+ }
+
+ return true;
+}
+
+bool isConnected() {
+ return (Wifi_AssocStatus() == ASSOCSTATUS_ASSOCIATED);
+}
+
+void disconnect() {
+ if(isConnected()) {
+ Wifi_DisconnectAP();
+ }
+}
+
+} // namespace Net
+
+} // namespace Tiki
Modified: tiki/osx/Tiki.xcodeproj/project.pbxproj
===================================================================
--- tiki/osx/Tiki.xcodeproj/project.pbxproj 2007-08-22 20:47:44 UTC (rev 486)
+++ tiki/osx/Tiki.xcodeproj/project.pbxproj 2007-08-23 00:01:53 UTC (rev 487)
@@ -17,6 +17,27 @@
6444BEE60932A3D800A29768 /* texturetile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6444BEE50932A3D700A29768 /* texturetile.cpp */; };
6444BEE80932A3F200A29768 /* texturetile.h in Headers */ = {isa = PBXBuildFile; fileRef = 6444BEE70932A3F200A29768 /* texturetile.h */; };
64D758F4092EB9A5002667EE /* sleep.h in Headers */ = {isa = PBXBuildFile; fileRef = 64D758F3092EB9A5002667EE /* sleep.h */; };
+ 64ED75F50C7CFAE500D16D5C /* address.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 64ED75F10C7CFAE500D16D5C /* address.cpp */; };
+ 64ED75F60C7CFAE500D16D5C /* socket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 64ED75F20C7CFAE500D16D5C /* socket.cpp */; };
+ 64ED75F70C7CFAE500D16D5C /* tcpserversocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 64ED75F30C7CFAE500D16D5C /* tcpserversocket.cpp */; };
+ 64ED75F80C7CFAE500D16D5C /* tcpsocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 64ED75F40C7CFAE500D16D5C /* tcpsocket.cpp */; };
+ 64ED75FD0C7CFB1800D16D5C /* request.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 64ED75FA0C7CFB1800D16D5C /* request.cpp */; };
+ 64ED75FE0C7CFB1800D16D5C /* response.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 64ED75FB0C7CFB1800D16D5C /* response.cpp */; };
+ 64ED75FF0C7CFB1800D16D5C /* useragent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 64ED75FC0C7CFB1800D16D5C /* useragent.cpp */; };
+ 64ED76190C7CFB4C00D16D5C /* address.h in Headers */ = {isa = PBXBuildFile; fileRef = 64ED76130C7CFB4C00D16D5C /* address.h */; };
+ 64ED761A0C7CFB4C00D16D5C /* buffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 64ED76140C7CFB4C00D16D5C /* buffer.h */; };
+ 64ED761B0C7CFB4C00D16D5C /* socket.h in Headers */ = {isa = PBXBuildFile; fileRef = 64ED76150C7CFB4C00D16D5C /* socket.h */; };
+ 64ED761C0C7CFB4C00D16D5C /* tcpserversocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 64ED76160C7CFB4C00D16D5C /* tcpserversocket.h */; };
+ 64ED761D0C7CFB4C00D16D5C /* tcpsocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 64ED76170C7CFB4C00D16D5C /* tcpsocket.h */; };
+ 64ED761E0C7CFB4C00D16D5C /* udpsocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 64ED76180C7CFB4C00D16D5C /* udpsocket.h */; };
+ 64ED76230C7CFB6200D16D5C /* cookie.h in Headers */ = {isa = PBXBuildFile; fileRef = 64ED761F0C7CFB6200D16D5C /* cookie.h */; };
+ 64ED76240C7CFB6200D16D5C /* request.h in Headers */ = {isa = PBXBuildFile; fileRef = 64ED76200C7CFB6200D16D5C /* request.h */; };
+ 64ED76250C7CFB6200D16D5C /* response.h in Headers */ = {isa = PBXBuildFile; fileRef = 64ED76210C7CFB6200D16D5C /* response.h */; };
+ 64ED76260C7CFB6200D16D5C /* useragent.h in Headers */ = {isa = PBXBuildFile; fileRef = 64ED76220C7CFB6200D16D5C /* useragent.h */; };
+ 64ED76290C7CFB7E00D16D5C /* endian.h in Headers */ = {isa = PBXBuildFile; fileRef = 64ED76270C7CFB7E00D16D5C /* endian.h */; };
+ 64ED762A0C7CFB7E00D16D5C /* net.h in Headers */ = {isa = PBXBuildFile; fileRef = 64ED76280C7CFB7E00D16D5C /* net.h */; };
+ 64ED762C0C7CFB9400D16D5C /* platnet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 64ED762B0C7CFB9400D16D5C /* platnet.cpp */; };
+ 64ED762E0C7CFBA100D16D5C /* platnet.h in Headers */ = {isa = PBXBuildFile; fileRef = 64ED762D0C7CFBA100D16D5C /* platnet.h */; };
8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; };
8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */; };
C4287F7C07C9491100D238E1 /* image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C4287F7B07C9491100D238E1 /* image.cpp */; };
@@ -184,6 +205,27 @@
6444BEE50932A3D700A29768 /* texturetile.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = texturetile.cpp; path = ../src/gl/drawables/texturetile.cpp; sourceTree = SOURCE_ROOT; };
6444BEE70932A3F200A29768 /* texturetile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = texturetile.h; path = ../include/Tiki/drawables/texturetile.h; sourceTree = SOURCE_ROOT; };
64D758F3092EB9A5002667EE /* sleep.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sleep.h; path = ../include/Tiki/anims/sleep.h; sourceTree = SOURCE_ROOT; };
+ 64ED75F10C7CFAE500D16D5C /* address.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = address.cpp; path = ../src/net/address.cpp; sourceTree = SOURCE_ROOT; };
+ 64ED75F20C7CFAE500D16D5C /* socket.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = socket.cpp; path = ../src/net/socket.cpp; sourceTree = SOURCE_ROOT; };
+ 64ED75F30C7CFAE500D16D5C /* tcpserversocket.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = tcpserversocket.cpp; path = ../src/net/tcpserversocket.cpp; sourceTree = SOURCE_ROOT; };
+ 64ED75F40C7CFAE500D16D5C /* tcpsocket.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = tcpsocket.cpp; path = ../src/net/tcpsocket.cpp; sourceTree = SOURCE_ROOT; };
+ 64ED75FA0C7CFB1800D16D5C /* request.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = request.cpp; path = ../src/net/http/request.cpp; sourceTree = SOURCE_ROOT; };
+ 64ED75FB0C7CFB1800D16D5C /* response.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = response.cpp; path = ../src/net/http/response.cpp; sourceTree = SOURCE_ROOT; };
+ 64ED75FC0C7CFB1800D16D5C /* useragent.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = useragent.cpp; path = ../src/net/http/useragent.cpp; sourceTree = SOURCE_ROOT; };
+ 64ED76130C7CFB4C00D16D5C /* address.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = address.h; path = ../include/Tiki/net/address.h; sourceTree = SOURCE_ROOT; };
+ 64ED76140C7CFB4C00D16D5C /* buffer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = buffer.h; path = ../include/Tiki/net/buffer.h; sourceTree = SOURCE_ROOT; };
+ 64ED76150C7CFB4C00D16D5C /* socket.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = socket.h; path = ../include/Tiki/net/socket.h; sourceTree = SOURCE_ROOT; };
+ 64ED76160C7CFB4C00D16D5C /* tcpserversocket.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = tcpserversocket.h; path = ../include/Tiki/net/tcpserversocket.h; sourceTree = SOURCE_ROOT; };
+ 64ED76170C7CFB4C00D16D5C /* tcpsocket.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = tcpsocket.h; path = ../include/Tiki/net/tcpsocket.h; sourceTree = SOURCE_ROOT; };
+ 64ED76180C7CFB4C00D16D5C /* udpsocket.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = udpsocket.h; path = ../include/Tiki/net/udpsocket.h; sourceTree = SOURCE_ROOT; };
+ 64ED761F0C7CFB6200D16D5C /* cookie.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = cookie.h; path = ../include/Tiki/net/http/cookie.h; sourceTree = SOURCE_ROOT; };
+ 64ED76200C7CFB6200D16D5C /* request.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = request.h; path = ../include/Tiki/net/http/request.h; sourceTree = SOURCE_ROOT; };
+ 64ED76210C7CFB6200D16D5C /* response.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = response.h; path = ../include/Tiki/net/http/response.h; sourceTree = SOURCE_ROOT; };
+ 64ED76220C7CFB6200D16D5C /* useragent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = useragent.h; path = ../include/Tiki/net/http/useragent.h; sourceTree = SOURCE_ROOT; };
+ 64ED76270C7CFB7E00D16D5C /* endian.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = endian.h; path = ../include/Tiki/endian.h; sourceTree = SOURCE_ROOT; };
+ 64ED76280C7CFB7E00D16D5C /* net.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = net.h; path = ../include/Tiki/net.h; sourceTree = SOURCE_ROOT; };
+ 64ED762B0C7CFB9400D16D5C /* platnet.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = platnet.cpp; path = src/platnet.cpp; sourceTree = "<group>"; };
+ 64ED762D0C7CFBA100D16D5C /* platnet.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = platnet.h; path = include/Tiki/platnet.h; sourceTree = "<group>"; };
8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
8DC2EF5B0486A6940098B216 /* Tiki.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Tiki.framework; sourceTree = BUILT_PRODUCTS_DIR; };
C40D72C1083723B50084B52D /* design_v2.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = design_v2.rtf; path = ../notes/design_v2.rtf; sourceTree = SOURCE_ROOT; };
@@ -475,9 +517,57 @@
name = "Other Sources";
sourceTree = "<group>";
};
+ 64ED75F00C7CFAC500D16D5C /* net */ = {
+ isa = PBXGroup;
+ children = (
+ 64ED75F90C7CFAE900D16D5C /* http */,
+ 64ED75F10C7CFAE500D16D5C /* address.cpp */,
+ 64ED75F20C7CFAE500D16D5C /* socket.cpp */,
+ 64ED75F30C7CFAE500D16D5C /* tcpserversocket.cpp */,
+ 64ED75F40C7CFAE500D16D5C /* tcpsocket.cpp */,
+ );
+ name = net;
+ sourceTree = "<group>";
+ };
+ 64ED75F90C7CFAE900D16D5C /* http */ = {
+ isa = PBXGroup;
+ children = (
+ 64ED75FA0C7CFB1800D16D5C /* request.cpp */,
+ 64ED75FB0C7CFB1800D16D5C /* response.cpp */,
+ 64ED75FC0C7CFB1800D16D5C /* useragent.cpp */,
+ );
+ name = http;
+ sourceTree = "<group>";
+ };
+ 64ED76110C7CFB2200D16D5C /* net */ = {
+ isa = PBXGroup;
+ children = (
+ 64ED76130C7CFB4C00D16D5C /* address.h */,
+ 64ED76140C7CFB4C00D16D5C /* buffer.h */,
+ 64ED76150C7CFB4C00D16D5C /* socket.h */,
+ 64ED76160C7CFB4C00D16D5C /* tcpserversocket.h */,
+ 64ED76170C7CFB4C00D16D5C /* tcpsocket.h */,
+ 64ED76180C7CFB4C00D16D5C /* udpsocket.h */,
+ 64ED76120C7CFB2D00D16D5C /* http */,
+ );
+ name = net;
+ sourceTree = "<group>";
+ };
+ 64ED76120C7CFB2D00D16D5C /* http */ = {
+ isa = PBXGroup;
+ children = (
+ 64ED761F0C7CFB6200D16D5C /* cookie.h */,
+ 64ED76200C7CFB6200D16D5C /* request.h */,
+ 64ED76210C7CFB6200D16D5C /* response.h */,
+ 64ED76220C7CFB6200D16D5C /* useragent.h */,
+ );
+ name = http;
+ sourceTree = "<group>";
+ };
C42BD273078FC90300061670 /* Include */ = {
isa = PBXGroup;
children = (
+ 64ED76110C7CFB2200D16D5C /* net */,
C4AD531B0793CF3400E1B779 /* AutoIncluded */,
C48ACAD2079B7121005DF20E /* audio */,
C4AD50FD0793ABEC00E1B779 /* base */,
@@ -492,10 +582,11 @@
C42BD2AD078FC94800061670 /* Source */ = {
isa = PBXGroup;
children = (
+ 64ED75F00C7CFAC500D16D5C /* net */,
C4AD52E30793CDC100E1B779 /* audio */,
C42BD2D6078FC9BF00061670 /* base */,
C4F51516079A0B1C0001D0D0 /* gl */,
- C4539923079A455600F3A584 /* hid */,
+ C4539923079A455600F3A584 /* t */,
C48814FE079F8A3B0038D5B0 /* image */,
C4F5157D079A0CFB0001D0D0 /* math */,
C472B72C079B0FBA00F0C00A /* thread */,
@@ -538,6 +629,7 @@
C42BD4B0078FCB0A00061670 /* Source */ = {
isa = PBXGroup;
children = (
+ 64ED762B0C7CFB9400D16D5C /* platnet.cpp */,
C498925907EE98040050854A /* platgl.cpp */,
C498925707EE97E70050854A /* TikiMain.m */,
C4B5838C0794CFC7004D22F2 /* init_shutdown.cpp */,
@@ -551,6 +643,7 @@
C42BD4B1078FCB0E00061670 /* Include */ = {
isa = PBXGroup;
children = (
+ 64ED762D0C7CFBA100D16D5C /* platnet.h */,
C4AD527D0793C96A00E1B779 /* glhdrs.h */,
C42BD4B3078FCB5A00061670 /* pch.h */,
C472B719079AFA1600F0C00A /* platthread.h */,
@@ -579,13 +672,13 @@
name = hid;
sourceTree = "<group>";
};
- C4539923079A455600F3A584 /* hid */ = {
+ C4539923079A455600F3A584 /* t */ = {
isa = PBXGroup;
children = (
C48E6CD607A48FDE00045273 /* eventcollector.cpp */,
C453992A079A477500F3A584 /* hid.cpp */,
);
- name = hid;
+ name = t;
sourceTree = "<group>";
};
C472B72C079B0FBA00F0C00A /* thread */ = {
@@ -629,6 +722,8 @@
C4AD50FD0793ABEC00E1B779 /* base */ = {
isa = PBXGroup;
children = (
+ 64ED76270C7CFB7E00D16D5C /* endian.h */,
+ 64ED76280C7CFB7E00D16D5C /* net.h */,
C4EAEB1F08678F1F003F5342 /* TikiAll.h */,
C4AD50E30793ABA000E1B779 /* debug.h */,
C4AD522B0793B4E300E1B779 /* file.h */,
@@ -979,6 +1074,19 @@
2290A10209302D9F00B7D80C /* pointerArrow.h in Headers */,
6444BEE80932A3F200A29768 /* texturetile.h in Headers */,
223226830A165A7A0035025E /* console.h in Headers */,
+ 64ED76190C7CFB4C00D16D5C /* address.h in Headers */,
+ 64ED761A0C7CFB4C00D16D5C /* buffer.h in Headers */,
+ 64ED761B0C7CFB4C00D16D5C /* socket.h in Headers */,
+ 64ED761C0C7CFB4C00D16D5C /* tcpserversocket.h in Headers */,
+ 64ED761D0C7CFB4C00D16D5C /* tcpsocket.h in Headers */,
+ 64ED761E0C7CFB4C00D16D5C /* udpsocket.h in Headers */,
+ 64ED76230C7CFB6200D16D5C /* cookie.h in Headers */,
+ 64ED76240C7CFB6200D16D5C /* request.h in Headers */,
+ 64ED76250C7CFB6200D16D5C /* response.h in Headers */,
+ 64ED76260C7CFB6200D16D5C /* useragent.h in Headers */,
+ 64ED76290C7CFB7E00D16D5C /* endian.h in Headers */,
+ 64ED762A0C7CFB7E00D16D5C /* net.h in Headers */,
+ 64ED762E0C7CFBA100D16D5C /* platnet.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1186,6 +1294,14 @@
2290A0FE09302D7500B7D80C /* pointerArrow.cpp in Sources */,
6444BEE60932A3D800A29768 /* texturetile.cpp in Sources */,
223226810A165A600035025E /* console.cpp in Sources */,
+ 64ED75F50C7CFAE500D16D5C /* address.cpp in Sources */,
+ 64ED75F60C7CFAE500D16D5C /* socket.cpp in Sources */,
+ 64ED75F70C7CFAE500D16D5C /* tcpserversocket.cpp in Sources */,
+ 64ED75F80C7CFAE500D16D5C /* tcpsocket.cpp in Sources */,
+ 64ED75FD0C7CFB1800D16D5C /* request.cpp in Sources */,
+ 64ED75FE0C7CFB1800D16D5C /* response.cpp in Sources */,
+ 64ED75FF0C7CFB1800D16D5C /* useragent.cpp in Sources */,
+ 64ED762C0C7CFB9400D16D5C /* platnet.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: tiki/osx/src/init_shutdown.cpp
===================================================================
--- tiki/osx/src/init_shutdown.cpp 2007-08-22 20:47:44 UTC (rev 486)
+++ tiki/osx/src/init_shutdown.cpp 2007-08-23 00:01:53 UTC (rev 487)
@@ -34,7 +34,7 @@
#if defined(ALC_VERSION_0_1)
dev = alcOpenDevice( const_cast<ALCchar *>( getenv( "OPENAL_DEVICE" ) ) ); // getenv()==NULL is okay.
#else
- dev = alcOpenDevice( getenv( "OPENAL_DEVICE" ) ); // getenv()==NULL is okay.
+ dev = alcOpenDevice( (ALCuint8 *)( getenv( "OPENAL_DEVICE" ) ) ); // getenv()==NULL is okay.
#endif
if ( dev != NULL ) {
Modified: tiki/osx/src/platnet.cpp
===================================================================
--- tiki/osx/src/platnet.cpp 2007-08-22 20:47:44 UTC (rev 486)
+++ tiki/osx/src/platnet.cpp 2007-08-23 00:01:53 UTC (rev 487)
@@ -7,7 +7,7 @@
*/
#include "Tiki/tiki.h"
-#include "Tiki/net/net.h"
+#include "Tiki/net.h"
namespace Tiki {
@@ -19,6 +19,17 @@
void shutdown() {
}
+bool connect() {
+ return true;
+}
+
+bool isConnect() {
+ return true;
+}
+
+void disconnect() {
+}
+
}; // namespace Net
}; // namespace Tiki
Modified: tiki/sdl/src/platnet.cpp
===================================================================
--- tiki/sdl/src/platnet.cpp 2007-08-22 20:47:44 UTC (rev 486)
+++ tiki/sdl/src/platnet.cpp 2007-08-23 00:01:53 UTC (rev 487)
@@ -13,14 +13,18 @@
namespace Net {
-void init()
-{
+void init() {
}
-void shutdown()
-{
+void shutdown() {
}
+bool connect() {
+}
+
+void disconnect() {
+}
+
} // namespace Net
} // namespace Tiki
Modified: tiki/src/net/address.cpp
===================================================================
--- tiki/src/net/address.cpp 2007-08-22 20:47:44 UTC (rev 486)
+++ tiki/src/net/address.cpp 2007-08-23 00:01:53 UTC (rev 487)
@@ -25,6 +25,7 @@
string Address::getHostName()
{
+#if TIKI_PLAT != TIKI_NDS
if(m_hostname.empty() &&
m_ip != AddressUnknown &&
m_ip != AddressBroadcast &&
@@ -37,6 +38,7 @@
m_hostname = string(hp->h_name);
}
}
+#endif
return m_hostname;
}
@@ -55,7 +57,11 @@
struct hostent *hp = gethostbyname(m_hostname.c_str());
if(hp != NULL)
{
+#if TIKI_PLAT == TIKI_NDS
+ memcpy(&m_ip, hp->h_addr_list[0], sizeof(unsigned long));
+#else
memcpy(&m_ip, hp->h_addr, hp->h_length);
+#endif
}
}
return m_ip;
Modified: tiki/src/net/tcpserversocket.cpp
===================================================================
--- tiki/src/net/tcpserversocket.cpp 2007-08-22 20:47:44 UTC (rev 486)
+++ tiki/src/net/tcpserversocket.cpp 2007-08-23 00:01:53 UTC (rev 487)
@@ -60,7 +60,7 @@
#endif
size_t addrlen = sizeof(struct sockaddr_in);
-#if TIKI_PLAT == TIKI_SDL
+#if TIKI_PLAT == TIKI_SDL || TIKI_PLAT == TIKI_OSX
socket = ::accept(m_socket, (sockaddr *)&sock_addr, (socklen_t *)&addrlen);
#else
socket = ::accept(m_socket, (sockaddr *)&sock_addr, (int *)&addrlen);
Modified: tiki/src/net/tcpsocket.cpp
===================================================================
--- tiki/src/net/tcpsocket.cpp 2007-08-22 20:47:44 UTC (rev 486)
+++ tiki/src/net/tcpsocket.cpp 2007-08-23 00:01:53 UTC (rev 487)
@@ -70,10 +70,12 @@
int yes = 1;
+#if TIKI_PLAT != TIKI_NDS
Tiki::Debug::printf("setting TCP_NODELAY\n");
setsockopt(m_socket, IPPROTO_TCP, TCP_NODELAY, (char *)&yes, sizeof(yes));
+#endif
-#if TIKI_PLAT != TIKI_WIN32
+#if TIKI_PLAT != TIKI_WIN32 && TIKI_PLAT != TIKI_NDS
if(isReuse()) {
Tiki::Debug::printf("setting reuse flag\n");
setsockopt(m_socket, SOL_SOCKET, SO_REUSEADDR, (char *)&yes, sizeof(yes));
@@ -103,15 +105,15 @@
void TCPSocket::close() {
m_open = false;
Tiki::Debug::printf("closing socket\n");
+ if(m_socket != INVALID_SOCKET) {
#if TIKI_PLAT == TIKI_WIN32
- if(m_socket != INVALID_SOCKET) {
+ shutdown(m_socket, SHUT_RDWR);
closesocket(m_socket);
- }
#else
- if(m_socket != INVALID_SOCKET) {
+ ::shutdown(m_socket, SHUT_RDWR);
::close(m_socket);
+#endif
}
-#endif
}
void TCPSocket::setNonBlocking(bool blocking)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
