Andrew Bonney
Modified version of NetServices. Fixes an issue where connections failed should the HTTP response status line be received in a packet on its own prior to any further headers. Changes are made to the HTTPClient.cpp file's readHeaders method.
services/http/client/data/HTTPFile.cpp@0:ec559500a63f, 2011-04-08 (annotated)
- Committer:
- andrewbonney
- Date:
- Fri Apr 08 14:39:41 2011 +0000
- Revision:
- 0:ec559500a63f
Who changed what in which revision?
| User | Revision | Line number | New contents of line |
|---|---|---|---|
| andrewbonney | 0:ec559500a63f | 1 | |
| andrewbonney | 0:ec559500a63f | 2 | /* |
| andrewbonney | 0:ec559500a63f | 3 | Copyright (c) 2010 Donatien Garnier (donatiengar [at] gmail [dot] com) |
| andrewbonney | 0:ec559500a63f | 4 | |
| andrewbonney | 0:ec559500a63f | 5 | Permission is hereby granted, free of charge, to any person obtaining a copy |
| andrewbonney | 0:ec559500a63f | 6 | of this software and associated documentation files (the "Software"), to deal |
| andrewbonney | 0:ec559500a63f | 7 | in the Software without restriction, including without limitation the rights |
| andrewbonney | 0:ec559500a63f | 8 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
| andrewbonney | 0:ec559500a63f | 9 | copies of the Software, and to permit persons to whom the Software is |
| andrewbonney | 0:ec559500a63f | 10 | furnished to do so, subject to the following conditions: |
| andrewbonney | 0:ec559500a63f | 11 | |
| andrewbonney | 0:ec559500a63f | 12 | The above copyright notice and this permission notice shall be included in |
| andrewbonney | 0:ec559500a63f | 13 | all copies or substantial portions of the Software. |
| andrewbonney | 0:ec559500a63f | 14 | |
| andrewbonney | 0:ec559500a63f | 15 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
| andrewbonney | 0:ec559500a63f | 16 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
| andrewbonney | 0:ec559500a63f | 17 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
| andrewbonney | 0:ec559500a63f | 18 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
| andrewbonney | 0:ec559500a63f | 19 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
| andrewbonney | 0:ec559500a63f | 20 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
| andrewbonney | 0:ec559500a63f | 21 | THE SOFTWARE. |
| andrewbonney | 0:ec559500a63f | 22 | */ |
| andrewbonney | 0:ec559500a63f | 23 | |
| andrewbonney | 0:ec559500a63f | 24 | #include "HTTPFile.h" |
| andrewbonney | 0:ec559500a63f | 25 | |
| andrewbonney | 0:ec559500a63f | 26 | //#define __DEBUG |
| andrewbonney | 0:ec559500a63f | 27 | #include "dbg/dbg.h" |
| andrewbonney | 0:ec559500a63f | 28 | |
| andrewbonney | 0:ec559500a63f | 29 | HTTPFile::HTTPFile(const char* path) : HTTPData(), m_fp(NULL), m_path(path), m_len(0), m_chunked(false) |
| andrewbonney | 0:ec559500a63f | 30 | { |
| andrewbonney | 0:ec559500a63f | 31 | |
| andrewbonney | 0:ec559500a63f | 32 | } |
| andrewbonney | 0:ec559500a63f | 33 | |
| andrewbonney | 0:ec559500a63f | 34 | HTTPFile::~HTTPFile() |
| andrewbonney | 0:ec559500a63f | 35 | { |
| andrewbonney | 0:ec559500a63f | 36 | closeFile(); |
| andrewbonney | 0:ec559500a63f | 37 | } |
| andrewbonney | 0:ec559500a63f | 38 | |
| andrewbonney | 0:ec559500a63f | 39 | void HTTPFile::clear() |
| andrewbonney | 0:ec559500a63f | 40 | { |
| andrewbonney | 0:ec559500a63f | 41 | closeFile(); |
| andrewbonney | 0:ec559500a63f | 42 | //Force reopening |
| andrewbonney | 0:ec559500a63f | 43 | } |
| andrewbonney | 0:ec559500a63f | 44 | |
| andrewbonney | 0:ec559500a63f | 45 | int HTTPFile::read(char* buf, int len) |
| andrewbonney | 0:ec559500a63f | 46 | { |
| andrewbonney | 0:ec559500a63f | 47 | if(!openFile("r")) //File does not exist, or I/O error... |
| andrewbonney | 0:ec559500a63f | 48 | return 0; |
| andrewbonney | 0:ec559500a63f | 49 | len = fread(buf, 1, len, m_fp); |
| andrewbonney | 0:ec559500a63f | 50 | if( feof(m_fp) ) |
| andrewbonney | 0:ec559500a63f | 51 | { |
| andrewbonney | 0:ec559500a63f | 52 | //File read completely, we can close it |
| andrewbonney | 0:ec559500a63f | 53 | closeFile(); |
| andrewbonney | 0:ec559500a63f | 54 | } |
| andrewbonney | 0:ec559500a63f | 55 | return len; |
| andrewbonney | 0:ec559500a63f | 56 | } |
| andrewbonney | 0:ec559500a63f | 57 | |
| andrewbonney | 0:ec559500a63f | 58 | int HTTPFile::write(const char* buf, int len) |
| andrewbonney | 0:ec559500a63f | 59 | { |
| andrewbonney | 0:ec559500a63f | 60 | if(!openFile("w")) //File does not exist, or I/O error... |
| andrewbonney | 0:ec559500a63f | 61 | return 0; |
| andrewbonney | 0:ec559500a63f | 62 | len = fwrite(buf, 1, len, m_fp); |
| andrewbonney | 0:ec559500a63f | 63 | DBG("Written %d bytes in %d\n", len, m_fp); |
| andrewbonney | 0:ec559500a63f | 64 | if( (!m_chunked && (ftell(m_fp) >= m_len)) || |
| andrewbonney | 0:ec559500a63f | 65 | (m_chunked && !len) ) |
| andrewbonney | 0:ec559500a63f | 66 | { |
| andrewbonney | 0:ec559500a63f | 67 | //File received completely, we can close it |
| andrewbonney | 0:ec559500a63f | 68 | closeFile(); |
| andrewbonney | 0:ec559500a63f | 69 | } |
| andrewbonney | 0:ec559500a63f | 70 | return len; |
| andrewbonney | 0:ec559500a63f | 71 | } |
| andrewbonney | 0:ec559500a63f | 72 | |
| andrewbonney | 0:ec559500a63f | 73 | string HTTPFile::getDataType() //Internet media type for Content-Type header |
| andrewbonney | 0:ec559500a63f | 74 | { |
| andrewbonney | 0:ec559500a63f | 75 | return ""; //Unknown |
| andrewbonney | 0:ec559500a63f | 76 | } |
| andrewbonney | 0:ec559500a63f | 77 | |
| andrewbonney | 0:ec559500a63f | 78 | void HTTPFile::setDataType(const string& type) //Internet media type from Content-Type header |
| andrewbonney | 0:ec559500a63f | 79 | { |
| andrewbonney | 0:ec559500a63f | 80 | //Do not really care here |
| andrewbonney | 0:ec559500a63f | 81 | } |
| andrewbonney | 0:ec559500a63f | 82 | |
| andrewbonney | 0:ec559500a63f | 83 | bool HTTPFile::getIsChunked() //For Transfer-Encoding header |
| andrewbonney | 0:ec559500a63f | 84 | { |
| andrewbonney | 0:ec559500a63f | 85 | return false; |
| andrewbonney | 0:ec559500a63f | 86 | } |
| andrewbonney | 0:ec559500a63f | 87 | |
| andrewbonney | 0:ec559500a63f | 88 | void HTTPFile::setIsChunked(bool chunked) //From Transfer-Encoding header |
| andrewbonney | 0:ec559500a63f | 89 | { |
| andrewbonney | 0:ec559500a63f | 90 | m_chunked = chunked; |
| andrewbonney | 0:ec559500a63f | 91 | } |
| andrewbonney | 0:ec559500a63f | 92 | |
| andrewbonney | 0:ec559500a63f | 93 | int HTTPFile::getDataLen() //For Content-Length header |
| andrewbonney | 0:ec559500a63f | 94 | { |
| andrewbonney | 0:ec559500a63f | 95 | return m_len; |
| andrewbonney | 0:ec559500a63f | 96 | } |
| andrewbonney | 0:ec559500a63f | 97 | |
| andrewbonney | 0:ec559500a63f | 98 | void HTTPFile::setDataLen(int len) //From Content-Length header, or if the transfer is chunked, next chunk length |
| andrewbonney | 0:ec559500a63f | 99 | { |
| andrewbonney | 0:ec559500a63f | 100 | if(!m_chunked) |
| andrewbonney | 0:ec559500a63f | 101 | m_len = len; //Useful so that we can close file when last byte is written |
| andrewbonney | 0:ec559500a63f | 102 | } |
| andrewbonney | 0:ec559500a63f | 103 | |
| andrewbonney | 0:ec559500a63f | 104 | bool HTTPFile::openFile(const char* mode) //true on success, false otherwise |
| andrewbonney | 0:ec559500a63f | 105 | { |
| andrewbonney | 0:ec559500a63f | 106 | if(m_fp) |
| andrewbonney | 0:ec559500a63f | 107 | return true; |
| andrewbonney | 0:ec559500a63f | 108 | |
| andrewbonney | 0:ec559500a63f | 109 | m_fp = fopen(m_path.c_str(), mode); |
| andrewbonney | 0:ec559500a63f | 110 | if(m_fp && mode[0]=='r') |
| andrewbonney | 0:ec559500a63f | 111 | { |
| andrewbonney | 0:ec559500a63f | 112 | //Seek EOF to get length |
| andrewbonney | 0:ec559500a63f | 113 | fseek(m_fp, 0, SEEK_END); |
| andrewbonney | 0:ec559500a63f | 114 | m_len = ftell(m_fp); |
| andrewbonney | 0:ec559500a63f | 115 | fseek(m_fp, 0, SEEK_SET); //Goto SOF |
| andrewbonney | 0:ec559500a63f | 116 | } |
| andrewbonney | 0:ec559500a63f | 117 | |
| andrewbonney | 0:ec559500a63f | 118 | DBG("fd = %d\n", m_fp); |
| andrewbonney | 0:ec559500a63f | 119 | |
| andrewbonney | 0:ec559500a63f | 120 | if(!m_fp) |
| andrewbonney | 0:ec559500a63f | 121 | return false; |
| andrewbonney | 0:ec559500a63f | 122 | |
| andrewbonney | 0:ec559500a63f | 123 | return true; |
| andrewbonney | 0:ec559500a63f | 124 | } |
| andrewbonney | 0:ec559500a63f | 125 | |
| andrewbonney | 0:ec559500a63f | 126 | void HTTPFile::closeFile() |
| andrewbonney | 0:ec559500a63f | 127 | { |
| andrewbonney | 0:ec559500a63f | 128 | if(m_fp) |
| andrewbonney | 0:ec559500a63f | 129 | fclose(m_fp); |
| andrewbonney | 0:ec559500a63f | 130 | } |