author | spiralman <spiralman> | 2003-03-15 15:27:49 (UTC) |
---|---|---|
committer | spiralman <spiralman> | 2003-03-15 15:27:49 (UTC) |
commit | 90c05874265e7047c0ca933a43c433eb0d7f04e4 (patch) (unidiff) | |
tree | d86c5d52c226f2a873b3c5745716dcd5ee38de3d /noncore/net/ubrowser/httpfactory.cpp | |
parent | 2c53d85583ebece42b3b4c155540cd6a01542731 (diff) | |
download | opie-90c05874265e7047c0ca933a43c433eb0d7f04e4.zip opie-90c05874265e7047c0ca933a43c433eb0d7f04e4.tar.gz opie-90c05874265e7047c0ca933a43c433eb0d7f04e4.tar.bz2 |
moved from using QSockets to normal unix sockets, images and chunked encoding **should** work <crosses fingers>
Diffstat (limited to 'noncore/net/ubrowser/httpfactory.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/ubrowser/httpfactory.cpp | 272 |
1 files changed, 260 insertions, 12 deletions
diff --git a/noncore/net/ubrowser/httpfactory.cpp b/noncore/net/ubrowser/httpfactory.cpp index 50a3c9a..0586e96 100644 --- a/noncore/net/ubrowser/httpfactory.cpp +++ b/noncore/net/ubrowser/httpfactory.cpp | |||
@@ -20,6 +20,6 @@ HttpFactory::HttpFactory(QTextBrowser *newBrowser):QMimeSourceFactory() | |||
20 | { | 20 | { |
21 | socket = new QSocket; | 21 | //socket = new QSocket; |
22 | text = new QTextDrag; | 22 | text = new QTextDrag; |
23 | browser=newBrowser; | 23 | browser=newBrowser; |
24 | comm = new HttpComm(socket, browser); | 24 | //comm = new HttpComm(socket, browser); |
25 | image = new QImageDrag; | 25 | image = new QImageDrag; |
@@ -33,5 +33,5 @@ const QMimeSource * HttpFactory::data(const QString &abs_name) const | |||
33 | QString host, file, portS, name, tempString; | 33 | QString host, file, portS, name, tempString; |
34 | bool done=false, isImage=false; | 34 | bool done=false, isText=true; |
35 | 35 | ||
36 | comm->setUp((QString *)&abs_name); | 36 | //comm->setUp((QString *)&abs_name); |
37 | 37 | ||
@@ -82,14 +82,77 @@ const QMimeSource * HttpFactory::data(const QString &abs_name) const | |||
82 | 82 | ||
83 | if(file.find(".png", file.length()-4) != -1 || file.find(".gif", file.length()-4) != -1 || file.find(".jpg", file.length()-4) != -1) | 83 | //if(file.find(".png", file.length()-4) != -1 || file.find(".gif", file.length()-4) != -1 || file.find(".jpg", file.length()-4) != -1) |
84 | { | 84 | //{ |
85 | isImage=true; | 85 | // isImage=true; |
86 | } | 86 | //} |
87 | 87 | ||
88 | comm->setStuff(host, portS, file, text, image, isImage); | 88 | //comm->setStuff(host, portS, file, text, image, isImage); |
89 | 89 | ||
90 | socket->connectToHost(host, port); | 90 | //socket->connectToHost(host, port); |
91 | |||
92 | int con, bytesSent; | ||
93 | struct sockaddr_in serverAddr; | ||
94 | struct hostent * serverInfo = gethostbyname( host.latin1() ); | ||
95 | |||
96 | if( serverInfo == NULL ) | ||
97 | { | ||
98 | QMessageBox *mb = new QMessageBox("Error!", | ||
99 | "couldnt find ip address", | ||
100 | QMessageBox::NoIcon, | ||
101 | QMessageBox::Ok, | ||
102 | QMessageBox::NoButton, | ||
103 | QMessageBox::NoButton); | ||
104 | mb->exec(); | ||
105 | perror("HttpFactory::data:"); | ||
106 | return 0; | ||
107 | } | ||
108 | |||
109 | QByteArray data; | ||
110 | printf( "HttpFactory::data: %s\n", inet_ntoa(*((struct in_addr *)serverInfo->h_addr )) ); | ||
111 | |||
112 | QString request("GET " + file + " HTTP/1.1\r\nHost: " + host + ':' + portS + "\r\nConnection: close\r\n\r\n"); | ||
113 | |||
114 | con = socket( AF_INET, SOCK_STREAM, 0 ); | ||
115 | if( con == -1 ) | ||
116 | { | ||
117 | QMessageBox *mb = new QMessageBox("Error!", | ||
118 | "couldnt create socket", | ||
119 | QMessageBox::NoIcon, | ||
120 | QMessageBox::Ok, | ||
121 | QMessageBox::NoButton, | ||
122 | QMessageBox::NoButton); | ||
123 | mb->exec(); | ||
124 | perror("HttpFactory::data:"); | ||
125 | return 0; | ||
126 | } | ||
127 | |||
128 | serverAddr.sin_family = AF_INET; | ||
129 | serverAddr.sin_port = htons( port ); | ||
130 | serverAddr.sin_addr.s_addr = inet_addr( inet_ntoa(*((struct in_addr *)serverInfo->h_addr )) ); | ||
131 | memset( &(serverAddr.sin_zero), '\0', 8 ); | ||
132 | |||
133 | if(::connect( con, (struct sockaddr *)&serverAddr, sizeof(struct sockaddr)) == -1 ) | ||
134 | { | ||
135 | QMessageBox *mb = new QMessageBox("Error!", | ||
136 | "couldnt connect to socket", | ||
137 | QMessageBox::NoIcon, | ||
138 | QMessageBox::Ok, | ||
139 | QMessageBox::NoButton, | ||
140 | QMessageBox::NoButton); | ||
141 | mb->exec(); | ||
142 | perror("HttpFactory::data:"); | ||
143 | return 0; | ||
144 | } | ||
91 | 145 | ||
92 | if(!image) | 146 | |
147 | bytesSent = send( con, request.latin1(), request.length(), 0); | ||
148 | printf("HttpFactory::data: bytes written: %d out of: %d\n", bytesSent, request.length() ); | ||
149 | printf("HttpFactory::data: request sent:\n%s", request.latin1()); | ||
150 | |||
151 | data = this->processResponse( con, isText ); | ||
152 | |||
153 | ::close( con ); | ||
154 | |||
155 | if(isText) | ||
93 | { | 156 | { |
94 | text->setText(""); | 157 | text->setText( QString( data ) ); |
95 | return text; | 158 | return text; |
@@ -98,2 +161,3 @@ const QMimeSource * HttpFactory::data(const QString &abs_name) const | |||
98 | { | 161 | { |
162 | image->setImage( QImage( data ) ); | ||
99 | return image; | 163 | return image; |
@@ -117 +181,185 @@ const QMimeSource * HttpFactory::data(const QString &abs_or_rel_name, const QStr | |||
117 | } | 181 | } |
182 | |||
183 | const QByteArray HttpFactory::processResponse( int sockfd, bool &isText ) const | ||
184 | { | ||
185 | QByteArray inputBin( 1 ); | ||
186 | QByteArray conClosedErr( 27 ); | ||
187 | char conClosedErrMsg[] = "Connection to server closed"; | ||
188 | QString currentLine; | ||
189 | bool done=false, chunked=false; | ||
190 | int dataLength = 0; | ||
191 | |||
192 | for( int i = 0; i < 27; i++) | ||
193 | { | ||
194 | conClosedErr[i] = conClosedErrMsg[i]; | ||
195 | } | ||
196 | |||
197 | while( !done ) | ||
198 | { | ||
199 | recv( sockfd, inputBin.data(), inputBin.size(), 0 ); | ||
200 | currentLine += *(inputBin.data()); | ||
201 | |||
202 | if( *(inputBin.data()) == '\n' ) | ||
203 | { | ||
204 | if( currentLine.isEmpty() || currentLine.startsWith( "\r") ) | ||
205 | { | ||
206 | printf( "HttpFactory::processResponse: end of header\n" ); | ||
207 | if( chunked ) | ||
208 | { | ||
209 | return recieveChunked( sockfd ); | ||
210 | } else { | ||
211 | return recieveNormal( sockfd, dataLength ); | ||
212 | } | ||
213 | done = true; | ||
214 | } | ||
215 | |||
216 | if( currentLine.contains( "Transfer-Encoding: chunked", false) >= 1 ) | ||
217 | { | ||
218 | chunked = true; | ||
219 | printf( "HttpFactory::processResponse: chunked encoding\n" ); | ||
220 | } | ||
221 | |||
222 | if( currentLine.contains( "Content-Type: text", false ) >= 1 ) | ||
223 | { | ||
224 | isText = true; | ||
225 | printf( "HttpFactory::processResponse: content type text\n" ); | ||
226 | } | ||
227 | |||
228 | if( currentLine.contains( "Content-Type: image", false ) >= 1 ) | ||
229 | { | ||
230 | isText = false; | ||
231 | printf( "HttpFactory::processResponse: content type image\n" ); | ||
232 | } | ||
233 | |||
234 | if( currentLine.contains( "Content-Length", false ) >= 1 ) | ||
235 | { | ||
236 | currentLine.remove( 0, 16 ); | ||
237 | dataLength = currentLine.toInt(); | ||
238 | printf( "HttpFactory::processResponse: content length: %d\n", dataLength ); | ||
239 | } | ||
240 | |||
241 | currentLine = ""; | ||
242 | printf("HttpFactory::processResponse: reseting currentLine: %s\n", currentLine.latin1() ); | ||
243 | } | ||
244 | } | ||
245 | } | ||
246 | |||
247 | const QByteArray HttpFactory::recieveNormal( int sockfd, int dataLen ) const | ||
248 | { | ||
249 | printf( "HttpFactory::recieveNormal: recieving w/out chunked encoding\n" ); | ||
250 | |||
251 | QByteArray data( dataLen ); | ||
252 | QByteArray temp( dataLen ); | ||
253 | int recieved, i; | ||
254 | |||
255 | recieved = recv( sockfd, temp.data(), temp.size(), 0 ); | ||
256 | printf( "HttpFactory::recieveNormal: found some data: %s\n", (char *)temp.data() ); | ||
257 | for( i = 0; i < recieved; i++ ) | ||
258 | { | ||
259 | data[i] = temp[i]; | ||
260 | } | ||
261 | dataLen -= recieved; | ||
262 | while( dataLen > 0 ) | ||
263 | { | ||
264 | recieved = recv( sockfd, temp.data(), temp.size(), 0 ); | ||
265 | dataLen -= recieved; | ||
266 | // printf( "HttpFactory::recieveNormal: found some more data: %s\n", (char *)temp.data() ); | ||
267 | for( int j = 0; j < recieved; j++ ) | ||
268 | { | ||
269 | data[i] = temp[j]; | ||
270 | i++; | ||
271 | } | ||
272 | temp.fill('\0'); | ||
273 | } | ||
274 | |||
275 | printf( "HttpFactory::recieveNormal: end of data\n" ); | ||
276 | return data; | ||
277 | } | ||
278 | |||
279 | const QByteArray HttpFactory::recieveChunked( int sockfd ) const | ||
280 | { | ||
281 | printf( "HttpFactory::recieveChunked: recieving data with chunked encoding\n" ); | ||
282 | |||
283 | QByteArray data; | ||
284 | QByteArray temp( 1 ); | ||
285 | int recieved, i = 0, cSize = 0; | ||
286 | QString cSizeS; | ||
287 | |||
288 | printf( "HttpFactory::recieveChunked: temp.size(): %d\n", temp.size() ); | ||
289 | recv( sockfd, temp.data(), temp.size(), 0 ); | ||
290 | while( *(temp.data()) != '\n' && *(temp.data()) != ';' ) | ||
291 | { | ||
292 | // printf( "HttpFactory::recieveChunked: temp.size(): %d\n", temp.size() ); | ||
293 | // printf( "HttpFactory::recieveChunked: temp.data(): %c\n", temp[0] ); | ||
294 | cSizeS += temp[0]; | ||
295 | recv( sockfd, temp.data(), temp.size(), 0 ); | ||
296 | } | ||
297 | |||
298 | printf( "HttpFactory::recieveChunked: cSizeS: %s\n", cSizeS.latin1() ); | ||
299 | cSize = cSizeS.toInt( 0, 16 ); | ||
300 | printf( "HttpFactory::recieveChunked: first chunk of size: %d\n", cSize ); | ||
301 | |||
302 | if( *(temp.data()) == ';' ) | ||
303 | { | ||
304 | while( *(temp.data()) != '\n' ) | ||
305 | { | ||
306 | recv( sockfd, temp.data(), temp.size(), 0 ); | ||
307 | } | ||
308 | } | ||
309 | |||
310 | temp.fill( '\0', cSize ); | ||
311 | data.fill( '\0', cSize ); | ||
312 | |||
313 | while( cSize > 0 ) | ||
314 | { | ||
315 | while( cSize > 0 ) | ||
316 | { | ||
317 | recieved = recv( sockfd, temp.data(), temp.size(), 0 ); | ||
318 | cSize -= recieved; | ||
319 | for( int j = 0; j < recieved; j++ ) | ||
320 | { | ||
321 | data[i] = temp[j]; | ||
322 | i++; | ||
323 | } | ||
324 | temp.fill('\0', cSize); | ||
325 | } | ||
326 | |||
327 | printf( "HttpFactory::recieveChunked: current data:\n%s", data.data() ); | ||
328 | |||
329 | temp.fill('\0', 1); | ||
330 | cSizeS = ""; | ||
331 | cSize = 0; | ||
332 | |||
333 | recv( sockfd, temp.data(), temp.size(), 0 ); | ||
334 | if( *(temp.data()) == '\r' ) | ||
335 | { | ||
336 | recv( sockfd, temp.data(), temp.size(), 0 ); | ||
337 | } | ||
338 | recv( sockfd, temp.data(), temp.size(), 0 ); | ||
339 | while( *(temp.data()) != '\n' && *(temp.data()) != ';' ) | ||
340 | { | ||
341 | // printf( "HttpFactory::recieveChunked: temp.size(): %d\n", temp.size() ); | ||
342 | printf( "HttpFactory::recieveChunked: temp.data(): %d\n", temp[0] ); | ||
343 | cSizeS += temp[0]; | ||
344 | recv( sockfd, temp.data(), temp.size(), 0 ); | ||
345 | } | ||
346 | |||
347 | printf( "HttpFactory::recieveChunked: cSizeS: %s\n", cSizeS.latin1() ); | ||
348 | cSize = cSizeS.toInt( 0, 16 ); | ||
349 | printf( "HttpFactory::recieveChunked: next chunk of size: %d\n", cSize ); | ||
350 | |||
351 | if( *(temp.data()) == ';' ) | ||
352 | { | ||
353 | while( *(temp.data()) != '\n' ) | ||
354 | { | ||
355 | recv( sockfd, temp.data(), temp.size(), 0 ); | ||
356 | } | ||
357 | } | ||
358 | |||
359 | temp.fill( '\0', cSize ); | ||
360 | data.resize( data.size() + cSize ); | ||
361 | } | ||
362 | |||
363 | printf( "HttpFactory::recieveChunked: end of data\n" ); | ||
364 | return data; | ||
365 | } | ||