generic-library/libupnp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1 - Ported some of IPV6 code to 1.6.7.

Browse Source 
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
This commit is contained in:
Marcelo Roberto Jimenez
2010-03-31 17:53:16 +00:00
parent 6c8a4dd361
commit 2bcbdffd89
32 changed files with 6648 additions and 5860 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
upnp/src/genlib/client_table/client_table.c
View File

@@ -43,8 +43,8 @@
* Function : copy_client_subscription
*
* Parameters :
* client_subscription * in ; - source client subscription
* client_subscription * out ; - destination client subscription
* ClientSubscription * in ; - source client subscription
* ClientSubscription * out ; - destination client subscription
*
* Description : Make a copy of the client subscription data
*
@@ -54,8 +54,8 @@
*
* Note :
************************************************************************/
CLIENTONLY( int copy_client_subscription( client_subscription * in,
client_subscription * out ) {
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 );
@@ -77,7 +77,7 @@ CLIENTONLY( int copy_client_subscription( client_subscription * in,
* Function : free_client_subscription
*
* Parameters :
* client_subscription * sub ; - Client subscription to be freed
* ClientSubscription * sub ; - Client subscription to be freed
*
* Description : Free memory allocated for client subscription data.
* Remove timer thread associated with this subscription event.
@@ -86,7 +86,7 @@ CLIENTONLY( int copy_client_subscription( client_subscription * in,
*
* Note :
************************************************************************/
void free_client_subscription( client_subscription * sub ) {
void free_client_subscription( ClientSubscription * sub ) {
upnp_timeout * event; ThreadPoolJob tempJob; if( sub ) {
if( sub->ActualSID )
free( sub->ActualSID ); if( sub->EventURL )
@@ -106,7 +106,7 @@ CLIENTONLY( int copy_client_subscription( client_subscription * in,
* Function : freeClientSubList
*
* Parameters :
* client_subscription * list ; Client subscription
* ClientSubscription * list ; Client subscription
*
* Description : Free the client subscription table.
*
@@ -114,8 +114,8 @@ CLIENTONLY( int copy_client_subscription( client_subscription * in,
*
* Note :
************************************************************************/
void freeClientSubList( client_subscription * list ) {
client_subscription * next; while( list ) {
void freeClientSubList( ClientSubscription * list ) {
ClientSubscription * next; while( list ) {
free_client_subscription( list );
next = list->next; free( list ); list = next;}
}
@@ -124,7 +124,7 @@ CLIENTONLY( int copy_client_subscription( client_subscription * in,
* Function : RemoveClientSubClientSID
*
* Parameters :
* client_subscription **head ; Head of the subscription list
* ClientSubscription **head ; Head of the subscription list
* const Upnp_SID sid ; Subscription ID to be mactched
*
* Description : Remove the client subscription matching the
@@ -135,10 +135,10 @@ CLIENTONLY( int copy_client_subscription( client_subscription * in,
*
* Note :
************************************************************************/
void RemoveClientSubClientSID( client_subscription ** head,
void RemoveClientSubClientSID( ClientSubscription ** head,
const Upnp_SID sid ) {
client_subscription * finger = ( *head );
client_subscription * previous = NULL; while( finger ) {
ClientSubscription * finger = ( *head );
ClientSubscription * previous = NULL; while( finger ) {
if( !( strcmp( sid, finger->sid ) ) ) {
if( previous )
previous->next = finger->next;
@@ -156,20 +156,20 @@ CLIENTONLY( int copy_client_subscription( client_subscription * in,
* Function : GetClientSubClientSID
*
* Parameters :
* client_subscription *head ; Head of the subscription list
* 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 : client_subscription * ; The matching subscription
* Return : ClientSubscription * ; The matching subscription
*
* Note :
************************************************************************/
client_subscription *
GetClientSubClientSID( client_subscription * head,
ClientSubscription *
GetClientSubClientSID( ClientSubscription * head,
const Upnp_SID sid ) {
client_subscription * next = head; while( next ) {
ClientSubscription * next = head; while( next ) {
if( !strcmp( next->sid, sid ) )
break;
else
@@ -182,21 +182,21 @@ CLIENTONLY( int copy_client_subscription( client_subscription * in,
* Function : GetClientSubActualSID
*
* Parameters :
* client_subscription *head ; Head of the subscription list
* 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 : client_subscription * ; The matching subscription
* Return : ClientSubscription * ; The matching subscription
*
* Note :
************************************************************************/
client_subscription *
GetClientSubActualSID( client_subscription * head,
ClientSubscription *
GetClientSubActualSID( ClientSubscription * head,
token * sid ) {
client_subscription * next = head; while( next ) {
ClientSubscription * next = head; while( next ) {
if( !memcmp( next->ActualSID, sid->buff, sid->size ) )
break;