[PATCH] ushare-freeworld: port to new libupnp API and fix missing
includes
Dominik 'Rathann' Mierzejewski
dominik at greysector.net
Sun Sep 4 00:12:53 CEST 2011
Two patches, actually, and none of them is FFmpeg-related.
The libupnp patch comes from OpenWRT:
https://dev.openwrt.org/raw-attachment/ticket/8296/101-ushare-upnp-build-fix.patch
and the other one just adds missing #include statements which generate
implicit function declaration warnings.
--
Fedora http://fedoraproject.org/wiki/User:Rathann
RPMFusion http://rpmfusion.org | MPlayer http://mplayerhq.hu
"Faith manages."
-- Delenn to Lennier in Babylon 5:"Confessions and Lamentations"
-------------- next part --------------
diff -wbBur ushare-1.1a/src/http.c ushare-1.1a.my/src/http.c
--- ushare-1.1a/src/http.c 2007-12-09 13:03:36.000000000 +0000
+++ ushare-1.1a.my/src/http.c 2010-10-29 11:13:07.000000000 +0000
@@ -77,8 +77,7 @@
info->content_type = ixmlCloneDOMString (content_type);
}
-static int
-http_get_info (const char *filename, struct File_Info *info)
+int http_get_info (const char *filename, struct File_Info *info)
{
extern struct ushare_t *ut;
struct upnp_entry_t *entry = NULL;
@@ -197,8 +196,7 @@
return ((UpnpWebFileHandle) file);
}
-static UpnpWebFileHandle
-http_open (const char *filename, enum UpnpOpenFileMode mode)
+UpnpWebFileHandle http_open (const char *filename, enum UpnpOpenFileMode mode)
{
extern struct ushare_t *ut;
struct upnp_entry_t *entry = NULL;
@@ -251,8 +249,7 @@
return ((UpnpWebFileHandle) file);
}
-static int
-http_read (UpnpWebFileHandle fh, char *buf, size_t buflen)
+int http_read (UpnpWebFileHandle fh, char *buf, size_t buflen)
{
struct web_file_t *file = (struct web_file_t *) fh;
ssize_t len = -1;
@@ -286,8 +283,7 @@
return len;
}
-static int
-http_write (UpnpWebFileHandle fh __attribute__((unused)),
+int http_write (UpnpWebFileHandle fh __attribute__((unused)),
char *buf __attribute__((unused)),
size_t buflen __attribute__((unused)))
{
@@ -296,8 +292,7 @@
return 0;
}
-static int
-http_seek (UpnpWebFileHandle fh, off_t offset, int origin)
+int http_seek (UpnpWebFileHandle fh, off_t offset, int origin)
{
struct web_file_t *file = (struct web_file_t *) fh;
off_t newpos = -1;
@@ -371,8 +366,7 @@
return 0;
}
-static int
-http_close (UpnpWebFileHandle fh)
+int http_close (UpnpWebFileHandle fh)
{
struct web_file_t *file = (struct web_file_t *) fh;
@@ -402,13 +396,3 @@
return 0;
}
-
-struct UpnpVirtualDirCallbacks virtual_dir_callbacks =
- {
- http_get_info,
- http_open,
- http_read,
- http_write,
- http_seek,
- http_close
- };
diff -wbBur ushare-1.1a/src/http.h ushare-1.1a.my/src/http.h
--- ushare-1.1a/src/http.h 2007-12-09 13:03:36.000000000 +0000
+++ ushare-1.1a.my/src/http.h 2010-10-29 11:13:11.000000000 +0000
@@ -25,6 +25,13 @@
#include <upnp/upnp.h>
#include <upnp/upnptools.h>
-struct UpnpVirtualDirCallbacks virtual_dir_callbacks;
+int http_close (UpnpWebFileHandle fh);
+int http_write (UpnpWebFileHandle fh __attribute__((unused)),
+ char *buf __attribute__((unused)),
+ size_t buflen __attribute__((unused)));
+int http_seek (UpnpWebFileHandle fh, off_t offset, int origin);
+UpnpWebFileHandle http_open (const char *filename, enum UpnpOpenFileMode mode);
+int http_read (UpnpWebFileHandle fh, char *buf, size_t buflen);
+int http_get_info (const char *filename, struct File_Info *info);
#endif /* _HTTP_H_ */
diff -wbBur ushare-1.1a/src/ushare.c ushare-1.1a.my/src/ushare.c
--- ushare-1.1a/src/ushare.c 2007-12-09 13:03:36.000000000 +0000
+++ ushare-1.1a.my/src/ushare.c 2010-10-29 11:17:45.000000000 +0000
@@ -188,7 +188,7 @@
if (strcmp (request->DevUDN + 5, ut->udn))
return;
- ip = request->CtrlPtIPAddr.s_addr;
+ ip = (*(struct sockaddr_in*)&request->CtrlPtIPAddr).sin_addr.s_addr;
ip = ntohl (ip);
sprintf (val, "%d.%d.%d.%d",
(ip >> 24) & 0xFF, (ip >> 16) & 0xFF, (ip >> 8) & 0xFF, ip & 0xFF);
@@ -348,7 +348,47 @@
UpnpEnableWebserver (TRUE);
- res = UpnpSetVirtualDirCallbacks (&virtual_dir_callbacks);
+ res = UpnpVirtualDir_set_WriteCallback(http_write);
+ if (res != UPNP_E_SUCCESS)
+ {
+ log_error (_("Cannot set virtual directory callbacks\n"));
+ free (description);
+ return -1;
+ }
+
+ res = UpnpVirtualDir_set_GetInfoCallback(http_get_info);
+ if (res != UPNP_E_SUCCESS)
+ {
+ log_error (_("Cannot set virtual directory callbacks\n"));
+ free (description);
+ return -1;
+ }
+
+ res = UpnpVirtualDir_set_ReadCallback(http_read);
+ if (res != UPNP_E_SUCCESS)
+ {
+ log_error (_("Cannot set virtual directory callbacks\n"));
+ free (description);
+ return -1;
+ }
+
+ res = UpnpVirtualDir_set_OpenCallback(http_open);
+ if (res != UPNP_E_SUCCESS)
+ {
+ log_error (_("Cannot set virtual directory callbacks\n"));
+ free (description);
+ return -1;
+ }
+
+ res = UpnpVirtualDir_set_SeekCallback(http_seek);
+ if (res != UPNP_E_SUCCESS)
+ {
+ log_error (_("Cannot set virtual directory callbacks\n"));
+ free (description);
+ return -1;
+ }
+
+ res = UpnpVirtualDir_set_CloseCallback(http_close);
if (res != UPNP_E_SUCCESS)
{
log_error (_("Cannot set virtual directory callbacks\n"));
-------------- next part --------------
diff -up ushare-1.1a/src/cds.c.compile ushare-1.1a/src/cds.c
--- ushare-1.1a/src/cds.c.compile 2007-12-09 14:03:36.000000000 +0100
+++ ushare-1.1a/src/cds.c 2011-08-30 00:18:44.000000000 +0200
@@ -20,6 +20,8 @@
*/
#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
#include <upnp/upnp.h>
#include <upnp/upnptools.h>
diff -up ushare-1.1a/src/cms.c.compile ushare-1.1a/src/cms.c
--- ushare-1.1a/src/cms.c.compile 2007-12-09 14:03:36.000000000 +0100
+++ ushare-1.1a/src/cms.c 2011-08-30 00:17:22.000000000 +0200
@@ -20,6 +20,7 @@
*/
#include <stdlib.h>
+#include <string.h>
#include <upnp/upnp.h>
#include <upnp/upnptools.h>
diff -up ushare-1.1a/src/http.c.compile ushare-1.1a/src/http.c
--- ushare-1.1a/src/http.c.compile 2011-08-30 00:17:22.000000000 +0200
+++ ushare-1.1a/src/http.c 2011-08-30 00:17:22.000000000 +0200
@@ -25,6 +25,7 @@
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <unistd.h>
#include <errno.h>
diff -up ushare-1.1a/src/mime.c.compile ushare-1.1a/src/mime.c
--- ushare-1.1a/src/mime.c.compile 2007-12-09 14:03:36.000000000 +0100
+++ ushare-1.1a/src/mime.c 2011-08-30 00:17:22.000000000 +0200
@@ -19,6 +19,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff -up ushare-1.1a/src/presentation.c.compile ushare-1.1a/src/presentation.c
--- ushare-1.1a/src/presentation.c.compile 2007-12-09 14:03:36.000000000 +0100
+++ ushare-1.1a/src/presentation.c 2011-08-30 00:18:55.000000000 +0200
@@ -19,6 +19,8 @@
*/
#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
#if HAVE_LANGINFO_CODESET
# include <langinfo.h>
diff -up ushare-1.1a/src/services.c.compile ushare-1.1a/src/services.c
--- ushare-1.1a/src/services.c.compile 2007-12-09 14:03:36.000000000 +0100
+++ ushare-1.1a/src/services.c 2011-08-30 00:17:22.000000000 +0200
@@ -20,6 +20,7 @@
*/
#include <stdlib.h>
+#include <string.h>
#include <upnp/upnp.h>
#include <upnp/upnptools.h>
More information about the rpmfusion-developers
mailing list