2bcbdffd89
2 - Backport of svn revision 527: * Added API to ithread, created the following functions: - int ithread_initialize_library(void); - int ithread_cleanup_library(void); - int ithread_initialize_thread(void); - int ithread_cleanup_thread(void); * SF Bug Tracker [ 2876374 ] Access Violation when compiling with Visual Studio 2008 Submitted: Stulle ( stulleamgym ) - 2009-10-10 19:05 Hi, I am one of the devs of the MorphXT project and I use this lib in some other of my projects, too. When I tried to upgrade the lib earlier for one of my projects I had to realise that something did not work at first and while most of the things were reasonably ease to be fixed. Now, the last thing I encountered was not so easy to fix and I am uncertain if my fix is any good so I'll just post it here and wait for some comments. The problem was that I got an Access Violation when calling "UpnpInit". It would call "ithread_rwlock_init(&GlobalHndRWLock, NULL)" which eventually led to calling "pthread_cond_init" and I got the error notice at "EnterCriticalSection (&ptw32_cond_list_lock);". It appeared that "ptw32_cond_list_lock" was NULL. Now, I found two ways to fix this. Firstly moving the whole block after at least one of the "ThreadPoolInit" calls will fix the issue. Secondly, you could add: #ifdef WIN32 #ifdef PTW32_STATIC_LIB // to get the following working we need this... is it a good patch or not... I do not know! pthread_win32_process_attach_np(); #endif #endif right before "ithread_rwlock_init(&GlobalHndRWLock, NULL)". Just so you know, I am using libupnp 1.6.6 and libpthreads 2.8.0 and both are linked static into the binaries. I am currently using Visual Studio 2008 for development with Windows being the target OS. Any comment at your end? Regards, Stulle git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/branches/branch-1.6.x@529 119443c7-1b9e-41f8-b6fc-b9c35fce742c
210 lines
8.0 KiB
C
210 lines
8.0 KiB
C
///////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// Copyright (c) 2000-2003 Intel Corporation
|
|
// All rights reserved.
|
|
//
|
|
// Redistribution and use in source and binary forms, with or without
|
|
// modification, are permitted provided that the following conditions are met:
|
|
//
|
|
// * Redistributions of source code must retain the above copyright notice,
|
|
// this list of conditions and the following disclaimer.
|
|
// * Redistributions in binary form must reproduce the above copyright notice,
|
|
// this list of conditions and the following disclaimer in the documentation
|
|
// and/or other materials provided with the distribution.
|
|
// * Neither name of Intel Corporation nor the names of its contributors
|
|
// may be used to endorse or promote products derived from this software
|
|
// without specific prior written permission.
|
|
//
|
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR
|
|
// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
|
// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
|
// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
|
|
// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
|
// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
//
|
|
///////////////////////////////////////////////////////////////////////////
|
|
|
|
/************************************************************************
|
|
* Purpose: This file defines the functions for clients. It defines
|
|
* functions for adding and removing clients to and from the client table,
|
|
* adding and accessing subscription and other attributes pertaining to the
|
|
* client
|
|
************************************************************************/
|
|
|
|
#include "config.h"
|
|
#include "client_table.h"
|
|
|
|
/************************************************************************
|
|
* Function : copy_client_subscription
|
|
*
|
|
* Parameters :
|
|
* ClientSubscription * in ; - source client subscription
|
|
* ClientSubscription * out ; - destination client subscription
|
|
*
|
|
* Description : Make a copy of the client subscription data
|
|
*
|
|
* Return : int ;
|
|
* UPNP_E_OUTOF_MEMORY - On Failure to allocate memory
|
|
* HTTP_SUCCESS - On Success
|
|
*
|
|
* Note :
|
|
************************************************************************/
|
|
CLIENTONLY( int copy_client_subscription( ClientSubscription * in,
|
|
ClientSubscription * out ) {
|
|
int len = strlen( in->ActualSID ) + 1;
|
|
int len1 = strlen( in->EventURL ) + 1;
|
|
memcpy( out->sid, in->sid, SID_SIZE );
|
|
out->sid[SID_SIZE] = 0;
|
|
out->ActualSID = ( char * )malloc( len );
|
|
if( out->ActualSID == NULL )
|
|
return UPNP_E_OUTOF_MEMORY;
|
|
out->EventURL = ( char * )malloc( len1 );
|
|
if( out->EventURL == NULL ) {
|
|
free(out->ActualSID);
|
|
return UPNP_E_OUTOF_MEMORY;
|
|
}
|
|
memcpy( out->ActualSID, in->ActualSID, len );
|
|
memcpy( out->EventURL, in->EventURL, len1 );
|
|
//copies do not get RenewEvent Ids or next
|
|
out->RenewEventId = -1; out->next = NULL; return HTTP_SUCCESS;}
|
|
|
|
/************************************************************************
|
|
* Function : free_client_subscription
|
|
*
|
|
* Parameters :
|
|
* ClientSubscription * sub ; - Client subscription to be freed
|
|
*
|
|
* Description : Free memory allocated for client subscription data.
|
|
* Remove timer thread associated with this subscription event.
|
|
*
|
|
* Return : void ;
|
|
*
|
|
* Note :
|
|
************************************************************************/
|
|
void free_client_subscription( ClientSubscription * sub ) {
|
|
upnp_timeout * event; ThreadPoolJob tempJob; if( sub ) {
|
|
if( sub->ActualSID )
|
|
free( sub->ActualSID ); if( sub->EventURL )
|
|
free( sub->EventURL ); if( sub->RenewEventId != -1 ) //do not remove timer event of copy
|
|
//invalid timer event id
|
|
{
|
|
if( TimerThreadRemove
|
|
( &gTimerThread, sub->RenewEventId, &tempJob ) == 0 ) {
|
|
event = ( upnp_timeout * ) tempJob.arg;
|
|
free_upnp_timeout( event );}
|
|
}
|
|
|
|
sub->RenewEventId = -1;}
|
|
}
|
|
|
|
/************************************************************************
|
|
* Function : freeClientSubList
|
|
*
|
|
* Parameters :
|
|
* ClientSubscription * list ; Client subscription
|
|
*
|
|
* Description : Free the client subscription table.
|
|
*
|
|
* Return : void ;
|
|
*
|
|
* Note :
|
|
************************************************************************/
|
|
void freeClientSubList( ClientSubscription * list ) {
|
|
ClientSubscription * next; while( list ) {
|
|
free_client_subscription( list );
|
|
next = list->next; free( list ); list = next;}
|
|
}
|
|
|
|
/************************************************************************
|
|
* Function : RemoveClientSubClientSID
|
|
*
|
|
* Parameters :
|
|
* ClientSubscription **head ; Head of the subscription list
|
|
* const Upnp_SID sid ; Subscription ID to be mactched
|
|
*
|
|
* Description : Remove the client subscription matching the
|
|
* subscritpion id represented by the const Upnp_SID sid parameter
|
|
* from the table and update the table.
|
|
*
|
|
* Return : void ;
|
|
*
|
|
* Note :
|
|
************************************************************************/
|
|
void RemoveClientSubClientSID( ClientSubscription ** head,
|
|
const Upnp_SID sid ) {
|
|
ClientSubscription * finger = ( *head );
|
|
ClientSubscription * previous = NULL; while( finger ) {
|
|
if( !( strcmp( sid, finger->sid ) ) ) {
|
|
if( previous )
|
|
previous->next = finger->next;
|
|
else
|
|
( *head ) = finger->next;
|
|
finger->next = NULL;
|
|
freeClientSubList( finger ); finger = NULL;}
|
|
else
|
|
{
|
|
previous = finger; finger = finger->next;}
|
|
}
|
|
}
|
|
|
|
/************************************************************************
|
|
* Function : GetClientSubClientSID
|
|
*
|
|
* Parameters :
|
|
* ClientSubscription *head ; Head of the subscription list
|
|
* const Upnp_SID sid ; Subscription ID to be matched
|
|
*
|
|
* Description : Return the client subscription from the client table
|
|
* that matches const Upnp_SID sid subscrition id value.
|
|
*
|
|
* Return : ClientSubscription * ; The matching subscription
|
|
*
|
|
* Note :
|
|
************************************************************************/
|
|
ClientSubscription *
|
|
GetClientSubClientSID( ClientSubscription * head,
|
|
const Upnp_SID sid ) {
|
|
ClientSubscription * next = head; while( next ) {
|
|
if( !strcmp( next->sid, sid ) )
|
|
break;
|
|
else
|
|
{
|
|
next = next->next;}
|
|
}
|
|
return next;}
|
|
|
|
/************************************************************************
|
|
* Function : GetClientSubActualSID
|
|
*
|
|
* Parameters :
|
|
* ClientSubscription *head ; Head of the subscription list
|
|
* token * sid ; Subscription ID to be matched
|
|
*
|
|
* Description : Returns the client subscription from the client
|
|
* subscription table that has the matching token * sid buffer
|
|
* value.
|
|
*
|
|
* Return : ClientSubscription * ; The matching subscription
|
|
*
|
|
* Note :
|
|
************************************************************************/
|
|
ClientSubscription *
|
|
GetClientSubActualSID( ClientSubscription * head,
|
|
token * sid ) {
|
|
ClientSubscription * next = head; while( next ) {
|
|
|
|
if( !memcmp( next->ActualSID, sid->buff, sid->size ) )
|
|
break;
|
|
else
|
|
{
|
|
next = next->next;}
|
|
}
|
|
return next;}
|
|
|
|
)
|