ObjFW  Diff

Differences From Artifact [902270c256]:

To Artifact [a7e950a736]:


63
64
65
66
67
68
69
70

71
72
73
74
75
76
77
78

79
80
81
82

83
84
85
86
87
88
89

90
91

92
93
94
95
96
97

98
99
100
101
102
103

104
105
106
107
108
109
110
111

112
113
114
115

116
117
118
119
120
121
122

123
124

125
126
127
128
129
130

131
132
133
134
135
136
137
138
139
140

141
142

143
144
145
146
147
148
149
150
151

152
153
154
155
156

157
158
159
160
161

162
163
164
165


166
167
168

169
170
171
172
173

174
175
176
177
178
63
64
65
66
67
68
69

70
71
72
73
74
75
76
77

78
79
80
81

82
83
84
85
86
87
88

89
90

91
92
93
94
95
96

97
98
99
100
101
102

103
104
105
106
107
108
109
110

111
112
113
114

115
116
117
118
119
120
121

122
123

124
125
126
127
128
129

130
131
132
133
134
135
136
137
138
139

140
141

142
143
144
145
146
147
148
149
150

151
152
153
154
155

156
157
158
159
160

161
162
163
164

165
166
167


168
169
170
171
172

173
174
175
176
177
178







-
+







-
+



-
+






-
+

-
+





-
+





-
+







-
+



-
+






-
+

-
+





-
+









-
+

-
+








-
+




-
+




-
+



-
+
+

-
-
+




-
+





+ (instancetype)socket
{
	return [[[self alloc] init] autorelease];
}

- (BOOL)lowlevelIsAtEndOfStream
{
	return atEndOfStream;
	return _atEndOfStream;
}

- (size_t)lowlevelReadIntoBuffer: (void*)buffer
			  length: (size_t)length
{
	ssize_t ret;

	if (sock == INVALID_SOCKET)
	if (_socket == INVALID_SOCKET)
		@throw [OFNotConnectedException exceptionWithClass: [self class]
							    socket: self];

	if (atEndOfStream) {
	if (_atEndOfStream) {
		OFReadFailedException *e;

		e = [OFReadFailedException exceptionWithClass: [self class]
						       stream: self
					      requestedLength: length];
#ifndef _WIN32
		e->errNo = ENOTCONN;
		e->_errNo = ENOTCONN;
#else
		e->errNo = WSAENOTCONN;
		e->_errNo = WSAENOTCONN;
#endif

		@throw e;
	}

	if ((ret = recv(sock, buffer, length, 0)) < 0)
	if ((ret = recv(_socket, buffer, length, 0)) < 0)
		@throw [OFReadFailedException exceptionWithClass: [self class]
							  stream: self
						 requestedLength: length];

	if (ret == 0)
		atEndOfStream = YES;
		_atEndOfStream = YES;

	return ret;
}

- (void)lowlevelWriteBuffer: (const void*)buffer
		     length: (size_t)length
{
	if (sock == INVALID_SOCKET)
	if (_socket == INVALID_SOCKET)
		@throw [OFNotConnectedException exceptionWithClass: [self class]
							    socket: self];

	if (atEndOfStream) {
	if (_atEndOfStream) {
		OFWriteFailedException *e;

		e = [OFWriteFailedException exceptionWithClass: [self class]
							stream: self
					       requestedLength: length];
#ifndef _WIN32
		e->errNo = ENOTCONN;
		e->_errNo = ENOTCONN;
#else
		e->errNo = WSAENOTCONN;
		e->_errNo = WSAENOTCONN;
#endif

		@throw e;
	}

	if (send(sock, buffer, length, 0) < length)
	if (send(_socket, buffer, length, 0) < length)
		@throw [OFWriteFailedException exceptionWithClass: [self class]
							   stream: self
						  requestedLength: length];
}

#ifdef _WIN32
- (void)setBlocking: (BOOL)enable
{
	u_long v = enable;
	blocking = enable;
	_blocking = enable;

	if (ioctlsocket(sock, FIONBIO, &v) == SOCKET_ERROR)
	if (ioctlsocket(_socket, FIONBIO, &v) == SOCKET_ERROR)
		@throw [OFSetOptionFailedException
		    exceptionWithClass: [self class]
				stream: self];
}
#endif

- (int)fileDescriptorForReading
{
	return sock;
	return _socket;
}

- (int)fileDescriptorForWriting
{
	return sock;
	return _socket;
}

- (void)close
{
	if (sock == INVALID_SOCKET)
	if (_socket == INVALID_SOCKET)
		@throw [OFNotConnectedException exceptionWithClass: [self class]
							    socket: self];

	close(sock);
	close(_socket);
	_socket = INVALID_SOCKET;

	sock = INVALID_SOCKET;
	atEndOfStream = NO;
	_atEndOfStream = NO;
}

- (void)dealloc
{
	if (sock != INVALID_SOCKET)
	if (_socket != INVALID_SOCKET)
		[self close];

	[super dealloc];
}
@end