Try to merge the modification from cybergarage.

README.md

@@ -0,0 +1,4 @@
+# mupnpc
+This project is forked from cybergarage/mupnpc. And will keep fix the bugs and add features based on the practice and ordinary useage.
+
+mUPnP for C is a development package for UPnP™ developers. CyberLink controls these protocols automatically, and supports to create your devices and control points quickly.

include/mupnp/controlpoint.h

@@ -348,13 +348,7 @@ mUpnpDevice *mupnp_controlpoint_getdevicebyudn(mUpnpControlPoint *ctrlPoint,
  * @param ctrlPoint The control point in question
  * @param evlistener The callback function to set, that is of type @ref MUPNP_EVENT_LISTENER, or NULL
  */
-#define mupnp_controlpoint_seteventlistener(ctrlPoint, evlistener) \
-	do {\
-		if (evlistener == NULL) \
-			mupnp_eventlistenerlist_remove(ctrlPoint->eventListeners, ctrlPoint->eventListeners->next->listener); \
-		else \
-			mupnp_eventlistenerlist_add(ctrlPoint->eventListeners, evlistener); \
-	} while(0)
+bool mupnp_controlpoint_seteventlistener(mUpnpControlPoint* ctrlPoint, MUPNP_EVENT_LISTENER evlistener);
 
 /**
  * Get the single event listener for the control point.

include/mupnp/device.h

@@ -123,6 +123,8 @@ typedef struct _mUpnpDevice
 {
   MUPNP_LIST_STRUCT_MEMBERS
 
+  /** Referrence Count */
+    int refCount;
   /** List of XML root nodes */
   mUpnpXmlNodeList *rootNodeList;
   /** This device's description XML node */

include/mupnp/event/event.h

@@ -13,7 +13,6 @@
 #define _MUPNP_EVENT_H_
 
 #include <mupnp/typedef.h>
-
 #include <mupnp/http/http.h>
 #include <mupnp/util/string.h>
 #include <mupnp/util/list.h>
@@ -106,14 +105,16 @@ typedef mUpnpHttpResponse mUpnpSubscriptionResponse;
 /**
  * Type definition for event listener callback
  */
-typedef void (*MUPNP_EVENT_LISTENER)(mUpnpProperty *);
+typedef void (*MUPNP_EVENT_LISTENER)(void *, mUpnpProperty *);
 
 /**
  * Type definition for event listener list
  */
 typedef struct _mUpnpEventListenerList {
-  MUPNP_LIST_STRUCT_MEMBERS
-
+//  MUPNP_LIST_STRUCT_MEMBERS
+    bool headFlag;
+    struct _mUpnpEventListenerList *prev;
+    struct _mUpnpEventListenerList *next;
 	MUPNP_EVENT_LISTENER listener;
 } mUpnpEventListenerList;
 
@@ -533,8 +534,7 @@ void mupnp_eventlistenerlist_add(mUpnpEventListenerList* eventListenerList, MUPN
  * @param eventListenerList The list to iterate thru
  * @param property The property that has been evented
  */
-void mupnp_eventlistenerlist_notify(mUpnpEventListenerList* eventListenerList, mUpnpProperty *property);
-
+void mupnp_eventlistenerlist_notify(void *ctrlPoint, mUpnpEventListenerList* eventListenerList, mUpnpProperty *property);
 
 #ifdef  __cplusplus
 }

include/mupnp/util/string.h

@@ -9,8 +9,8 @@
  *
  ******************************************************************/
 
-#ifndef _MUPNP_UTIL_STRING_H_
-#define _MUPNP_UTIL_STRING_H_
+#ifndef _MUPNP_UTIL_STRING_H_A_
+#define _MUPNP_UTIL_STRING_H_A_
 
 #include <mupnp/typedef.h>
 #include <stdlib.h>

src/mupnp/controlpoint.c

@@ -621,6 +621,9 @@ static mUpnpDevice *mupnp_controlpoint_createdevicefromssdkpacket(mUpnpSSDPPacke
 	url = mupnp_net_url_new();
 	mupnp_net_url_set(url, location);
 	parseSuccess =  mupnp_device_parsedescriptionurl(dev, url);
+    if (parseSuccess) {
+        mupnp_device_sethttpport(dev, mupnp_net_url_getport(url));
+    }
 	mupnp_net_url_delete(url);
 
 	if (parseSuccess == false) {

src/mupnp/controlpoint_event.c

@@ -18,6 +18,22 @@
 
 #if !defined(MUPNP_NOUSE_CONTROLPOINT) && !defined(MUPNP_NOUSE_SUBSCRIPTION)
 
+bool mupnp_controlpoint_seteventlistener(mUpnpControlPoint* ctrlPoint, MUPNP_EVENT_LISTENER evlistener)
+{
+
+    mUpnpEventListenerList* nextEvListener;
+    do {
+        if (evlistener == NULL) {
+            nextEvListener = (mUpnpEventListenerList*)ctrlPoint->eventListeners->next;
+            mupnp_eventlistenerlist_remove(ctrlPoint->eventListeners, nextEvListener->listener);
+        }
+        else
+            mupnp_eventlistenerlist_add(ctrlPoint->eventListeners, evlistener);
+    } while (0);
+
+    return true;
+}
+
 mUpnpService *mupnp_device_getfirstexpiratedservice(mUpnpControlPoint *ctrlPoint,
 						       mUpnpDevice *dev, 
 						       mUpnpTime expirationTime)

src/mupnp/controlpoint_http_server.c

@@ -100,7 +100,8 @@ void mupnp_controlpoint_httprequestreceived(mUpnpHttpRequest *httpReq)
 			     prop != NULL; 
 			     prop = mupnp_property_next(prop)) 
 			{
-				mupnp_eventlistenerlist_notify(eventListeners, prop);
+//                printf("\n%s\n%s\n%s\n", prop->name->value, prop->sid->value, prop->value->value);
+				mupnp_eventlistenerlist_notify(ctrlPoint, eventListeners, prop);
 			}
 		}
 

src/mupnp/device.c

@@ -53,6 +53,7 @@ mUpnpDevice *mupnp_device_new()
 #ifdef MUPNP_HTTP_USE_PERSISTENT_CONNECTIONS
 		mupnp_http_persistentconnection_init();
 #endif
+        dev->refCount = 0;
 
 		dev->rootNodeList = NULL;
 		dev->deviceNode = NULL;
@@ -96,6 +97,9 @@ mUpnpDevice *mupnp_device_new()
 void mupnp_device_delete(mUpnpDevice *dev)
 {
 	mupnp_log_debug_l4("Entering...\n");
+    if (dev->refCount > 0) {
+        return;
+    }
 
 	mupnp_list_remove((mUpnpList *)dev);
 

src/mupnp/event/eventlistener_list.c

@@ -9,6 +9,7 @@
  *
  ******************************************************************/
 
+#include <mupnp/controlpoint.h>
 #include <mupnp/event/event.h>
 #include <mupnp/util/log.h>
 
@@ -117,7 +118,7 @@ void mupnp_eventlistenerlist_add(mUpnpEventListenerList* eventListenerList, MUPN
  * @param eventListenerList The list to iterate thru
  * @param property The property that has been evented
  */
-void mupnp_eventlistenerlist_notify(mUpnpEventListenerList* eventListenerList, mUpnpProperty *property)
+void mupnp_eventlistenerlist_notify(void *ctrlPoint, mUpnpEventListenerList* eventListenerList, mUpnpProperty *property)
 {
 	mUpnpEventListenerList *list_node = NULL;
 
@@ -129,7 +130,7 @@ void mupnp_eventlistenerlist_notify(mUpnpEventListenerList* eventListenerList, m
 	{
 		if (list_node->listener != NULL)
 		{
-			list_node->listener(property);
+			list_node->listener(ctrlPoint, property);
 		}
 	}
 

src/mupnp/http/http_date.c

@@ -21,6 +21,8 @@
 * to_month_string()
 ****************************************/
 
+#if defined(ITRON)
+
 static char MONTH_STRING[][4] = {
 	"Jan",
 	"Feb",
@@ -45,10 +47,14 @@ static char *to_month_string(int value)
 	return "";
 }
 
+#endif
+
 /****************************************
 * to_week_string()
 ****************************************/
 
+#if defined(ITRON)
+
 static char WEEK_STRING[][4] = {
 	"Sun",
 	"Mon",
@@ -71,6 +77,8 @@ static char *to_week_string(int value)
 	mupnp_log_debug_l4("Leaving...\n");
 }
 
+#endif
+
 /****************************************
 * mupnp_http_getservername()
 ****************************************/

src/mupnp/util/log.c

@@ -202,7 +202,7 @@ void mupnp_log_print(int severity, const char *file, int line_n, const char *fun
 	char log_line[MAX_LOG_STRING], *l_ptr, t_ptr[MAX_LOG_STRING];
 	int prefix_length = -1;
 	struct fd_list *temp = NULL;
-	size_t timestamp;
+	time_t timestamp;
 	struct tm *timestamp_human_readable;
 
 	/* If output targets are empty, do return */

std/av/include/cybergarage/upnp/std/av/ccontent.h → std/av/include/mupnp/std/av/ccontent.h

@@ -88,7 +88,7 @@ void mupnp_upnpav_content_copy(mUpnpAvContent *destContent, mUpnpAvContent *srcC
 void mupnp_upnpav_content_addchildcontent(mUpnpAvContent *con, mUpnpAvContent *childCon);
 int mupnp_upnpav_content_getnchildcontents(mUpnpAvContent *con);
 mUpnpAvContent *mupnp_upnpav_content_getchildcontents(mUpnpAvContent *con);
-BOOL mupnp_upnpav_content_haschildcontents(mUpnpAvContent *con);
+bool mupnp_upnpav_content_haschildcontents(mUpnpAvContent *con);
 #define mupnp_upnpav_content_clearchildcontents(con) mupnp_xml_nodelist_clear(mupnp_xml_node_getchildnodelist(con))
 
 #define mupnp_upnpav_content_setid(con, val) mupnp_xml_node_setattribute(con, CG_UPNPAV_CONTENT_ID, val)
@@ -109,14 +109,14 @@ BOOL mupnp_upnpav_content_haschildcontents(mUpnpAvContent *con);
 void mupnp_upnpav_content_settype(mUpnpAvContent *con, int type);
 int mupnp_upnpav_content_gettype(mUpnpAvContent *con);
 
-#define mupnp_upnpav_content_isitemnode(node) (mupnp_upnpav_content_gettype(node) == CG_UPNPAV_CONTENT_ITEM ? TRUE : FALSE)
-#define mupnp_upnpav_content_iscontainernode(node) (mupnp_upnpav_content_gettype(node) == CG_UPNPAV_CONTENT_CONTAINER ? TRUE : FALSE)
-BOOL mupnp_upnpav_content_iscontentnode(mUpnpXmlNode *node);
+#define mupnp_upnpav_content_isitemnode(node) (mupnp_upnpav_content_gettype(node) == CG_UPNPAV_CONTENT_ITEM ? true : false)
+#define mupnp_upnpav_content_iscontainernode(node) (mupnp_upnpav_content_gettype(node) == CG_UPNPAV_CONTENT_CONTAINER ? true : false)
+bool mupnp_upnpav_content_iscontentnode(mUpnpXmlNode *node);
 
 #define mupnp_upnpav_content_setuserdata(con, data) mupnp_xml_node_setuserdata(con, data)
 #define mupnp_upnpav_content_getuserdata(con) mupnp_xml_node_getuserdata(con)
 
-typedef BOOL (*CG_UPNPAV_CONTENT_COMPARE_FUNC)(mUpnpAvContent *con, void *userData);
+typedef bool (*CG_UPNPAV_CONTENT_COMPARE_FUNC)(mUpnpAvContent *con, void *userData);
 mUpnpAvContent *mupnp_upnpav_content_getbyid(mUpnpAvContent *con, char *id);
 mUpnpAvContent *mupnp_upnpav_content_getbytitle(mUpnpAvContent *con, char *title);
 

std/av/include/cybergarage/upnp/std/av/cdidl.h → std/av/include/mupnp/std/av/cdidl.h

@@ -28,7 +28,7 @@ extern "C" {
 mUpnpXmlNode *mupnp_upnpav_didl_node_new();
 
 #define mupnp_upnpav_didl_node_delete(node) mupnp_xml_node_delete(node)
-#define mupnp_upnpav_didl_node_tostring(node, str) mupnp_xml_node_tostring(node, TRUE, str)
+#define mupnp_upnpav_didl_node_tostring(node, str) mupnp_xml_node_tostring(node, true, str)
 
 #ifdef __cplusplus
 }

std/av/include/cybergarage/upnp/std/av/cmediaserver.h → std/av/include/mupnp/std/av/cmediaserver.h

@@ -181,7 +181,7 @@ mUpnpAvContent *mupnp_upnpav_dms_findcontentbyid(mUpnpAvServer *dms, char *objec
 * Connection Manager
 ****************************************/
 
-BOOL mupnp_upnpav_dms_conmgr_init(mUpnpAvServer *dms);
+bool mupnp_upnpav_dms_conmgr_init(mUpnpAvServer *dms);
 
 /****************************************
 * Network Interface
@@ -190,14 +190,14 @@ BOOL mupnp_upnpav_dms_conmgr_init(mUpnpAvServer *dms);
 #define mupnp_upnpav_dms_getnetworkinterfaces(dms) mupnp_net_interfacelist_gets(dms->networkInterfaceList)
 #define mupnp_upnpav_dms_getnnetworkinterfaces(dms) mupnp_net_interfacelist_size(dms->networkInterfaceList)
 
-BOOL mupnp_upnpav_dms_updatenetworkinterfaces(mUpnpAvServer *dms);
+bool mupnp_upnpav_dms_updatenetworkinterfaces(mUpnpAvServer *dms);
 mUpnpNetworkInterface *mupnp_upnpav_dms_getnetworkinterface(mUpnpAvServer *dms);
 
 /****************************************
 * Content Directory
 ****************************************/
 
-BOOL mupnp_upnpav_dms_condir_init(mUpnpAvServer *dms);
+bool mupnp_upnpav_dms_condir_init(mUpnpAvServer *dms);
 
 void mupnp_upnpav_dms_condir_setsystemupdateid(mUpnpAvServer *dms, int id);
 int mupnp_upnpav_dms_condir_getsystemupdateid(mUpnpAvServer *dms);
@@ -207,7 +207,7 @@ void mupnp_upnpav_dms_condir_updatesystemupdateid(mUpnpAvServer *dms);
 * Media Receiveer
 ****************************************/
 
-BOOL mupnp_upnpav_dms_medrec_init(mUpnpAvServer *dms);
+bool mupnp_upnpav_dms_medrec_init(mUpnpAvServer *dms);
 
 
 #ifdef  __cplusplus

std/av/include/cybergarage/upnp/std/av/cprotocolinfo.h → std/av/include/mupnp/std/av/cprotocolinfo.h

@@ -42,7 +42,7 @@ extern "C" {
  * The generic protocolinfo struct
  */
 typedef struct _mUpnpAvProtocolInfo {
-	BOOL headFlag;
+	bool headFlag;
 	struct _mUpnpAvProtocolInfo *prev;
 	struct _mUpnpAvProtocolInfo *next;
 	mUpnpString *protocol;

std/av/include/cybergarage/upnp/std/av/cupnpav.h → std/av/include/mupnp/std/av/cupnpav.h

@@ -22,19 +22,32 @@
 extern "C" {
 #endif
 
+#define CG_UPNPAV_OBJECT_CONTAINER "container"
+#define CG_UPNPAV_OBJECT_ITEM "item"
 #define CG_UPNPAV_OBJECT_ID "id"
 #define CG_UPNPAV_OBJECT_PARENTID "parentID"
 #define CG_UPNPAV_OBJECT_CHILDCOUNT "childCount"
 #define CG_UPNPAV_OBJECT_RESTRICTED "restricted"
 #define CG_UPNPAV_OBJECT_TITLE "dc:title"
+#define CG_UPNPAV_OBJECT_CREATOR "dc:creator"
 #define CG_UPNPAV_OBJECT_DATE "dc:date"
 #define CG_UPNPAV_OBJECT_UPNPCLASS "upnp:class"
+#define CG_UPNPAV_OBJECT_TRACKNUMBER "upnp:originalTrackNumber"
+#define CG_UPNPAV_OBJECT_ARTIST "upnp:artist"
+#define CG_UPNPAV_OBJECT_ALBUM "upnp:album"
+#define CG_UPNPAV_OBJECT_GENRE "upnp:genre"
 #define CG_UPNPAV_OBJECT_ALBUMARTURI "upnp:albumArtURI"
 #define CG_UPNPAV_OBJECT_ROOT_ID "0"
+
+#define CG_UPNPAV_RES "res"
+#define CG_UPNPAV_RES_PROTOCOLINFO "protocolInfo"
+#define CG_UPNPAV_RES_SIZE "size"
+#define CG_UPNPAV_RES_DURATION "duration"
+#define CG_UPNPAV_RES_BITRATE "bitrate"
 
-typedef BOOL (*CG_UPNPAV_HTTP_LISTENER)(mUpnpHttpRequest *);
-typedef BOOL (*CG_UPNPAV_ACTION_LISTNER)(mUpnpAction *);
-typedef BOOL (*CG_UPNPAV_STATEVARIABLE_LISTNER)(mUpnpStateVariable *);
+typedef bool (*CG_UPNPAV_HTTP_LISTENER)(mUpnpHttpRequest *);
+typedef bool (*CG_UPNPAV_ACTION_LISTNER)(mUpnpAction *);
+typedef bool (*CG_UPNPAV_STATEVARIABLE_LISTNER)(mUpnpStateVariable *);
 
 #ifdef __cplusplus
 }