NetServicesMod - Modified version of NetServices. Fixes an issue w…

Users » andrewbonney » Code » NetServicesMod

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.

api/TCPSocket.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 "TCPSocket.h"
andrewbonney	0:ec559500a63f	25	#include "if/net/nettcpsocket.h"
andrewbonney	0:ec559500a63f	26
andrewbonney	0:ec559500a63f	27	TCPSocket::TCPSocket() : m_pNetTcpSocket(NULL), m_pCbItem(NULL), m_pCbMeth(NULL), m_pCb(NULL)
andrewbonney	0:ec559500a63f	28	{
andrewbonney	0:ec559500a63f	29
andrewbonney	0:ec559500a63f	30	}
andrewbonney	0:ec559500a63f	31
andrewbonney	0:ec559500a63f	32	TCPSocket::TCPSocket(NetTcpSocket* pNetTcpSocket) : m_pNetTcpSocket(pNetTcpSocket), m_pCbItem(NULL), m_pCbMeth(NULL), m_pCb(NULL)
andrewbonney	0:ec559500a63f	33	{
andrewbonney	0:ec559500a63f	34	m_pNetTcpSocket->setOnEvent(this, &TCPSocket::onNetTcpSocketEvent);
andrewbonney	0:ec559500a63f	35	}
andrewbonney	0:ec559500a63f	36
andrewbonney	0:ec559500a63f	37	TCPSocket::~TCPSocket() //close()
andrewbonney	0:ec559500a63f	38	{
andrewbonney	0:ec559500a63f	39	close();
andrewbonney	0:ec559500a63f	40	}
andrewbonney	0:ec559500a63f	41
andrewbonney	0:ec559500a63f	42	TCPSocketErr TCPSocket::bind(const Host& me)
andrewbonney	0:ec559500a63f	43	{
andrewbonney	0:ec559500a63f	44	TCPSocketErr tcpSocketErr = checkInst();
andrewbonney	0:ec559500a63f	45	if(tcpSocketErr)
andrewbonney	0:ec559500a63f	46	return tcpSocketErr;
andrewbonney	0:ec559500a63f	47	return (TCPSocketErr) m_pNetTcpSocket->bind(me);
andrewbonney	0:ec559500a63f	48	}
andrewbonney	0:ec559500a63f	49
andrewbonney	0:ec559500a63f	50	TCPSocketErr TCPSocket::listen()
andrewbonney	0:ec559500a63f	51	{
andrewbonney	0:ec559500a63f	52	TCPSocketErr tcpSocketErr = checkInst();
andrewbonney	0:ec559500a63f	53	if(tcpSocketErr)
andrewbonney	0:ec559500a63f	54	return tcpSocketErr;
andrewbonney	0:ec559500a63f	55	return (TCPSocketErr) m_pNetTcpSocket->listen();
andrewbonney	0:ec559500a63f	56	}
andrewbonney	0:ec559500a63f	57
andrewbonney	0:ec559500a63f	58	TCPSocketErr TCPSocket::connect(const Host& host)
andrewbonney	0:ec559500a63f	59	{
andrewbonney	0:ec559500a63f	60	TCPSocketErr tcpSocketErr = checkInst();
andrewbonney	0:ec559500a63f	61	if(tcpSocketErr)
andrewbonney	0:ec559500a63f	62	return tcpSocketErr;
andrewbonney	0:ec559500a63f	63	return (TCPSocketErr) m_pNetTcpSocket->connect(host);
andrewbonney	0:ec559500a63f	64	}
andrewbonney	0:ec559500a63f	65
andrewbonney	0:ec559500a63f	66	TCPSocketErr TCPSocket::accept(Host* pClient, TCPSocket** ppNewTCPSocket)
andrewbonney	0:ec559500a63f	67	{
andrewbonney	0:ec559500a63f	68	TCPSocketErr tcpSocketErr = checkInst();
andrewbonney	0:ec559500a63f	69	if(tcpSocketErr)
andrewbonney	0:ec559500a63f	70	return tcpSocketErr;
andrewbonney	0:ec559500a63f	71	NetTcpSocket* pNewNetTcpSocket;
andrewbonney	0:ec559500a63f	72	tcpSocketErr = (TCPSocketErr) m_pNetTcpSocket->accept(pClient, &pNewNetTcpSocket);
andrewbonney	0:ec559500a63f	73	if(pNewNetTcpSocket)
andrewbonney	0:ec559500a63f	74	*ppNewTCPSocket = new TCPSocket(pNewNetTcpSocket);
andrewbonney	0:ec559500a63f	75	return tcpSocketErr;
andrewbonney	0:ec559500a63f	76	}
andrewbonney	0:ec559500a63f	77
andrewbonney	0:ec559500a63f	78	int /if < 0 : TCPSocketErr/ TCPSocket::send(const char* buf, int len)
andrewbonney	0:ec559500a63f	79	{
andrewbonney	0:ec559500a63f	80	TCPSocketErr tcpSocketErr = checkInst();
andrewbonney	0:ec559500a63f	81	if(tcpSocketErr)
andrewbonney	0:ec559500a63f	82	return tcpSocketErr;
andrewbonney	0:ec559500a63f	83	return m_pNetTcpSocket->send(buf, len);
andrewbonney	0:ec559500a63f	84	}
andrewbonney	0:ec559500a63f	85
andrewbonney	0:ec559500a63f	86	int /if < 0 : TCPSocketErr/ TCPSocket::recv(char* buf, int len)
andrewbonney	0:ec559500a63f	87	{
andrewbonney	0:ec559500a63f	88	TCPSocketErr tcpSocketErr = checkInst();
andrewbonney	0:ec559500a63f	89	if(tcpSocketErr)
andrewbonney	0:ec559500a63f	90	return tcpSocketErr;
andrewbonney	0:ec559500a63f	91	return m_pNetTcpSocket->recv(buf, len);
andrewbonney	0:ec559500a63f	92	}
andrewbonney	0:ec559500a63f	93
andrewbonney	0:ec559500a63f	94	TCPSocketErr TCPSocket::close()
andrewbonney	0:ec559500a63f	95	{
andrewbonney	0:ec559500a63f	96	if(!m_pNetTcpSocket)
andrewbonney	0:ec559500a63f	97	return TCPSOCKET_SETUP;
andrewbonney	0:ec559500a63f	98	m_pNetTcpSocket->resetOnEvent();
andrewbonney	0:ec559500a63f	99	TCPSocketErr tcpSocketErr = (TCPSocketErr) m_pNetTcpSocket->close(); //Close (can already be closed)
andrewbonney	0:ec559500a63f	100	Net::releaseTcpSocket(m_pNetTcpSocket); //And release it so it can be freed when properly removed
andrewbonney	0:ec559500a63f	101	m_pNetTcpSocket = NULL;
andrewbonney	0:ec559500a63f	102	return tcpSocketErr;
andrewbonney	0:ec559500a63f	103	}
andrewbonney	0:ec559500a63f	104
andrewbonney	0:ec559500a63f	105	//Callbacks
andrewbonney	0:ec559500a63f	106	void TCPSocket::setOnEvent( void (*pMethod)(TCPSocketEvent) )
andrewbonney	0:ec559500a63f	107	{
andrewbonney	0:ec559500a63f	108	m_pCb = pMethod;
andrewbonney	0:ec559500a63f	109	}
andrewbonney	0:ec559500a63f	110
andrewbonney	0:ec559500a63f	111	#if 0 //For info only
andrewbonney	0:ec559500a63f	112	template<class T>
andrewbonney	0:ec559500a63f	113	void TCPSocket::setOnEvent( T* pItem, void (T::*pMethod)(TCPSocketEvent) )
andrewbonney	0:ec559500a63f	114	{
andrewbonney	0:ec559500a63f	115	m_pCbItem = (CDummy*) pItem;
andrewbonney	0:ec559500a63f	116	m_pCbMeth = (void (CDummy::*)(TCPSocketEvent)) pMethod;
andrewbonney	0:ec559500a63f	117	}
andrewbonney	0:ec559500a63f	118	#endif
andrewbonney	0:ec559500a63f	119
andrewbonney	0:ec559500a63f	120	void TCPSocket::resetOnEvent() //Disable callback
andrewbonney	0:ec559500a63f	121	{
andrewbonney	0:ec559500a63f	122	m_pCb = NULL;
andrewbonney	0:ec559500a63f	123	m_pCbItem = NULL;
andrewbonney	0:ec559500a63f	124	m_pCbMeth = NULL;
andrewbonney	0:ec559500a63f	125	}
andrewbonney	0:ec559500a63f	126
andrewbonney	0:ec559500a63f	127	void TCPSocket::onNetTcpSocketEvent(NetTcpSocketEvent e)
andrewbonney	0:ec559500a63f	128	{
andrewbonney	0:ec559500a63f	129	if(m_pCbItem && m_pCbMeth)
andrewbonney	0:ec559500a63f	130	(m_pCbItem->*m_pCbMeth)((TCPSocketEvent) e);
andrewbonney	0:ec559500a63f	131	else if(m_pCb)
andrewbonney	0:ec559500a63f	132	m_pCb((TCPSocketEvent) e);
andrewbonney	0:ec559500a63f	133	}
andrewbonney	0:ec559500a63f	134
andrewbonney	0:ec559500a63f	135	TCPSocketErr TCPSocket::checkInst()
andrewbonney	0:ec559500a63f	136	{
andrewbonney	0:ec559500a63f	137	if(!m_pNetTcpSocket)
andrewbonney	0:ec559500a63f	138	{
andrewbonney	0:ec559500a63f	139	m_pNetTcpSocket = Net::tcpSocket();
andrewbonney	0:ec559500a63f	140	if(!m_pNetTcpSocket)
andrewbonney	0:ec559500a63f	141	{
andrewbonney	0:ec559500a63f	142	return TCPSOCKET_IF; //Interface did not return a socket (usually because a default interface does not exist)
andrewbonney	0:ec559500a63f	143	}
andrewbonney	0:ec559500a63f	144	m_pNetTcpSocket->setOnEvent(this, &TCPSocket::onNetTcpSocketEvent);
andrewbonney	0:ec559500a63f	145	}
andrewbonney	0:ec559500a63f	146	return TCPSOCKET_OK;
andrewbonney	0:ec559500a63f	147	}

Repository toolbox

Export to desktop IDE

Repository details

Type:	Library
Created:	08 Apr 2011
Imports:	86
Forks:	0
Commits:	1
Dependents:	0
Dependencies:	0
Followers:	3

api/TCPSocket.cpp@0:ec559500a63f, 2011-04-08 (annotated)

Who changed what in which revision?

Repository toolbox

Repository details

Important Information for this Arm website

Access Warning