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

Syncronize ssdplib in 1.6.x and 1.8.x.

Browse Source
This commit is contained in:
Marcelo Roberto Jimenez 2010-12-19 21:14:39 -02:00
parent f67ed1949b
commit 2ce88f80f0
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
upnp/src/inc/ssdplib.h
View File

@ -284,7 +284,7 @@ void ssdp_handle_ctrlpt_msg(
/* [in] SSDP message from the device. */
http_message_t *hmsg,
/* [in] Address of the device. */
struct sockaddr *dest_addr,
struct sockaddr_storage *dest_addr,
/* [in] timeout kept by the control point while sending search message.
* Only in search reply. */
int timeout,
@ -347,13 +347,13 @@ void ssdp_handle_device_request(
/* [in] . */
http_message_t *hmsg,
/* [in] . */
struct sockaddr *dest_addr);
struct sockaddr_storage *dest_addr);
#else /* INCLUDE_DEVICE_APIS */
static inline void ssdp_handle_device_request(
/* [in] . */
http_message_t *hmsg,
/* [in] . */
struct sockaddr* dest_addr) {}
struct sockaddr_storage *dest_addr) {}
#endif /* INCLUDE_DEVICE_APIS */
/*!

2
upnp/src/ssdp/ssdp_ctrlpt.c
View File

@ -75,7 +75,7 @@ static void send_search_result(
free(temp);
}
void ssdp_handle_ctrlpt_msg(http_message_t *hmsg, struct sockaddr *dest_addr,
void ssdp_handle_ctrlpt_msg(http_message_t *hmsg, struct sockaddr_storage *dest_addr,
int timeout, void *cookie)
{
int handle;

4
upnp/src/ssdp/ssdp_device.c
View File

@ -74,7 +74,7 @@ void *advertiseAndReplyThread(void *data)
}
#ifdef INCLUDE_DEVICE_APIS
void ssdp_handle_device_request(http_message_t *hmsg, struct sockaddr *dest_addr)
void ssdp_handle_device_request(http_message_t *hmsg, struct sockaddr_storage *dest_addr)
{
#define MX_FUDGE_FACTOR 10
int handle;
@ -112,7 +112,7 @@ void ssdp_handle_device_request(http_message_t *hmsg, struct sockaddr *dest_addr
HandleLock();
/* device info. */
if (GetDeviceHandleInfo(dest_addr->sa_family,
if (GetDeviceHandleInfo(dest_addr->ss_family,
&handle, &dev_info) != HND_DEVICE) {
HandleUnlock();
/* no info found. */

4
upnp/src/ssdp/ssdp_server.c
View File

@ -615,12 +615,12 @@ static void ssdp_event_handler_thread(
hmsg->request_method == HTTPMETHOD_MSEARCH) {
#ifdef INCLUDE_CLIENT_APIS
ssdp_handle_ctrlpt_msg(hmsg,
(struct sockaddr *)&data->dest_addr,
&data->dest_addr,
FALSE, NULL);
#endif /* INCLUDE_CLIENT_APIS */
} else {
ssdp_handle_device_request(hmsg,
(struct sockaddr *)&data->dest_addr);
&data->dest_addr);
}
/* free data */