pool/openslp
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openslp?expand=0&rev=7

Browse Source
This commit is contained in:
OBS User unknown 2008-03-26 15:26:26 +00:00 committed by Git OBS Bridge
parent b25b5f0ed9
commit 6fba8dfd62
4 changed files with 137 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
extensions.diff
View File

@ -1,5 +1,5 @@
--- ./common/Makefile.am.orig 2003-02-13 05:19:57.000000000 +0000 --- ./common/Makefile.am.orig 2003-02-13 05:19:57.000000000 +0000
+++ ./common/Makefile.am 2006-11-16 16:19:30.000000000 +0000 +++ ./common/Makefile.am 2008-03-19 15:38:14.000000000 +0000
@@ -24,6 +24,7 @@ libcommonlibslp_la_SOURCES = \ @@ -24,6 +24,7 @@ libcommonlibslp_la_SOURCES = \
slp_parse.c \ slp_parse.c \
slp_pid.c \ slp_pid.c \
@ -25,7 +25,7 @@
AM_YFLAGS = -d AM_YFLAGS = -d
--- ./common/slp_compare.c.orig 2002-12-03 21:04:49.000000000 +0000 --- ./common/slp_compare.c.orig 2002-12-03 21:04:49.000000000 +0000
+++ ./common/slp_compare.c 2006-11-16 16:19:30.000000000 +0000 +++ ./common/slp_compare.c 2008-03-19 15:38:14.000000000 +0000
@@ -146,6 +146,17 @@ int SLPCompareNamingAuth(int srvtypelen, @@ -146,6 +146,17 @@ int SLPCompareNamingAuth(int srvtypelen,
if(namingauthlen == 0xffff) /* match all naming authorities */ if(namingauthlen == 0xffff) /* match all naming authorities */
return 0; return 0;
@ -44,8 +44,8 @@
dot = memchr(srvtype,'.',srvtypelen); dot = memchr(srvtype,'.',srvtypelen);
if(!namingauthlen) /* IANA naming authority */ if(!namingauthlen) /* IANA naming authority */
--- ./common/slp_mdns.c.orig 2006-11-16 16:19:30.000000000 +0000 --- ./common/slp_mdns.c.orig 2008-03-19 15:38:14.000000000 +0000
+++ ./common/slp_mdns.c 2006-11-16 16:19:30.000000000 +0000 +++ ./common/slp_mdns.c 2008-03-19 15:38:14.000000000 +0000
@@ -0,0 +1,573 @@ @@ -0,0 +1,573 @@
+#include "slp_mdns.h" +#include "slp_mdns.h"
+#include "slp_message.h" +#include "slp_message.h"
@ -620,8 +620,8 @@
+ return 0; + return 0;
+} +}
+ +
--- ./common/slp_mdns.h.orig 2006-11-16 16:19:30.000000000 +0000 --- ./common/slp_mdns.h.orig 2008-03-19 15:38:14.000000000 +0000
+++ ./common/slp_mdns.h 2006-11-16 16:19:30.000000000 +0000 +++ ./common/slp_mdns.h 2008-03-19 15:38:14.000000000 +0000
@@ -0,0 +1,102 @@ @@ -0,0 +1,102 @@
+#ifndef SLP_MDNS_H_INCLUDED +#ifndef SLP_MDNS_H_INCLUDED
+#define SLP_MDNS_H_INCLUDED +#define SLP_MDNS_H_INCLUDED
@ -726,7 +726,7 @@
+ +
+#endif +#endif
--- ./common/slp_message.h.orig 2003-04-04 06:52:07.000000000 +0000 --- ./common/slp_message.h.orig 2003-04-04 06:52:07.000000000 +0000
+++ ./common/slp_message.h 2006-11-16 16:19:30.000000000 +0000 +++ ./common/slp_message.h 2008-03-19 15:38:14.000000000 +0000
@@ -170,6 +170,10 @@ typedef UINT32* PUINT32; @@ -170,6 +170,10 @@ typedef UINT32* PUINT32;
#define SLP_REG_SOURCE_LOCAL 2 /* from localhost or IPC */ #define SLP_REG_SOURCE_LOCAL 2 /* from localhost or IPC */
#define SLP_REG_SOURCE_STATIC 3 /* from the slp.reg file */ #define SLP_REG_SOURCE_STATIC 3 /* from the slp.reg file */
@ -747,8 +747,8 @@
/* The following are not part of the RFC protocol. They are used by */ /* The following are not part of the RFC protocol. They are used by */
/* the OpenSLP implementation for convenience */ /* the OpenSLP implementation for convenience */
int source; int source;
--- ./common/slp_net.c.orig 2006-11-16 16:19:17.000000000 +0000 --- ./common/slp_net.c.orig 2002-12-03 21:04:50.000000000 +0000
+++ ./common/slp_net.c 2006-11-16 16:19:30.000000000 +0000 +++ ./common/slp_net.c 2008-03-19 15:38:14.000000000 +0000
@@ -80,7 +80,19 @@ int SLPNetGetThisHostname(char** hostfdn @@ -80,7 +80,19 @@ int SLPNetGetThisHostname(char** hostfdn
if(gethostname(host, MAX_HOST_NAME) == 0) if(gethostname(host, MAX_HOST_NAME) == 0)
@ -771,7 +771,7 @@
{ {
/* if the hostname has a '.' then it is probably a qualified /* if the hostname has a '.' then it is probably a qualified
--- ./common/slp_property.c.orig 2002-12-03 21:04:50.000000000 +0000 --- ./common/slp_property.c.orig 2002-12-03 21:04:50.000000000 +0000
+++ ./common/slp_property.c 2006-11-16 16:19:30.000000000 +0000 +++ ./common/slp_property.c 2008-03-19 15:38:14.000000000 +0000
@@ -219,7 +219,7 @@ int SetDefaultValues() @@ -219,7 +219,7 @@ int SetDefaultValues()
@ -864,8 +864,8 @@
int SLPPropertyAsBoolean(const char* property) int SLPPropertyAsBoolean(const char* property)
/*=========================================================================*/ /*=========================================================================*/
{ {
--- ./common/slp_spi.c.orig 2006-11-16 16:19:17.000000000 +0000 --- ./common/slp_spi.c.orig 2002-09-10 04:38:25.000000000 +0000
+++ ./common/slp_spi.c 2006-11-16 16:19:30.000000000 +0000 +++ ./common/slp_spi.c 2008-03-19 15:38:14.000000000 +0000
@@ -395,6 +395,8 @@ SLPCryptoDSAKey* SLPSpiGetDSAKey(SLPSpiH @@ -395,6 +395,8 @@ SLPCryptoDSAKey* SLPSpiGetDSAKey(SLPSpiH
} }
@ -893,7 +893,7 @@
+ } + }
+} +}
--- ./common/slp_spi.h.orig 2002-03-19 23:52:15.000000000 +0000 --- ./common/slp_spi.h.orig 2002-03-19 23:52:15.000000000 +0000
+++ ./common/slp_spi.h 2006-11-16 16:19:30.000000000 +0000 +++ ./common/slp_spi.h 2008-03-19 15:38:14.000000000 +0000
@@ -172,7 +172,13 @@ int SLPSpiCanSign(SLPSpiHandle hspi, @@ -172,7 +172,13 @@ int SLPSpiCanSign(SLPSpiHandle hspi,
/* Returns Non-zero if we sign using the specified SPI */ /* Returns Non-zero if we sign using the specified SPI */
/*=========================================================================*/ /*=========================================================================*/
@ -910,7 +910,7 @@
--- ./common/slp_xcast.c.orig 2003-04-04 06:52:07.000000000 +0000 --- ./common/slp_xcast.c.orig 2003-04-04 06:52:07.000000000 +0000
+++ ./common/slp_xcast.c 2006-11-16 16:19:30.000000000 +0000 +++ ./common/slp_xcast.c 2008-03-19 15:38:14.000000000 +0000
@@ -72,6 +72,7 @@ @@ -72,6 +72,7 @@
#include "slp_xcast.h" #include "slp_xcast.h"
@ -951,7 +951,7 @@
socks->peeraddr[socks->sock_count].sin_family = AF_INET; socks->peeraddr[socks->sock_count].sin_family = AF_INET;
socks->peeraddr[socks->sock_count].sin_port = htons(SLP_RESERVED_PORT); socks->peeraddr[socks->sock_count].sin_port = htons(SLP_RESERVED_PORT);
--- ./libslp/Makefile.am.orig 2001-07-11 21:03:59.000000000 +0000 --- ./libslp/Makefile.am.orig 2001-07-11 21:03:59.000000000 +0000
+++ ./libslp/Makefile.am 2006-11-16 16:19:30.000000000 +0000 +++ ./libslp/Makefile.am 2008-03-19 15:38:14.000000000 +0000
@@ -23,6 +23,7 @@ libslp_la_SOURCES = libslp_dereg.c \ @@ -23,6 +23,7 @@ libslp_la_SOURCES = libslp_dereg.c \
libslp_delattrs.c \ libslp_delattrs.c \
libslp_findsrvtypes.c \ libslp_findsrvtypes.c \
@ -961,7 +961,7 @@
libslp_la_LIBADD = ../common/libcommonlibslp.la libslp_la_LIBADD = ../common/libcommonlibslp.la
libslp_la_LDFLAGS = -version-info 1:0:0 libslp_la_LDFLAGS = -version-info 1:0:0
--- ./libslp/libslp_findsrvs.c.orig 2003-04-04 06:52:08.000000000 +0000 --- ./libslp/libslp_findsrvs.c.orig 2003-04-04 06:52:08.000000000 +0000
+++ ./libslp/libslp_findsrvs.c 2006-11-16 16:29:43.000000000 +0000 +++ ./libslp/libslp_findsrvs.c 2008-03-19 15:38:14.000000000 +0000
@@ -54,7 +54,8 @@ SLPBoolean ColateSLPSrvURLCallback(SLPHa @@ -54,7 +54,8 @@ SLPBoolean ColateSLPSrvURLCallback(SLPHa
const char* pcSrvURL, const char* pcSrvURL,
unsigned short sLifetime, unsigned short sLifetime,
@ -1066,8 +1066,8 @@
} }
} }
--- ./libslp/libslp_mdns.c.orig 2006-11-16 16:19:30.000000000 +0000 --- ./libslp/libslp_mdns.c.orig 2008-03-19 15:38:14.000000000 +0000
+++ ./libslp/libslp_mdns.c 2006-11-16 16:19:30.000000000 +0000 +++ ./libslp/libslp_mdns.c 2008-03-19 15:38:14.000000000 +0000
@@ -0,0 +1,915 @@ @@ -0,0 +1,915 @@
+#ifdef _WIN32 +#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN
@ -1984,8 +1984,8 @@
+ return result; + return result;
+} +}
+ +
--- ./libslp/libslp_mdns.h.orig 2006-11-16 16:19:30.000000000 +0000 --- ./libslp/libslp_mdns.h.orig 2008-03-19 15:38:14.000000000 +0000
+++ ./libslp/libslp_mdns.h 2006-11-16 16:19:30.000000000 +0000 +++ ./libslp/libslp_mdns.h 2008-03-19 15:38:14.000000000 +0000
@@ -0,0 +1,14 @@ @@ -0,0 +1,14 @@
+#include "slp_mdns.h" +#include "slp_mdns.h"
+#include "libslp.h" +#include "libslp.h"
@ -2002,7 +2002,7 @@
+ struct timeval* timeout, + struct timeval* timeout,
+ SLPBuffer mdnssendbuf, int buftype, PSLPHandleInfo handle); + SLPBuffer mdnssendbuf, int buftype, PSLPHandleInfo handle);
--- ./libslp/libslp_network.c.orig 2003-08-20 05:25:58.000000000 +0000 --- ./libslp/libslp_network.c.orig 2003-08-20 05:25:58.000000000 +0000
+++ ./libslp/libslp_network.c 2006-11-16 16:19:30.000000000 +0000 +++ ./libslp/libslp_network.c 2008-03-19 15:39:16.000000000 +0000
@@ -49,6 +49,7 @@ @@ -49,6 +49,7 @@
#include "slp.h" #include "slp.h"
@ -2011,7 +2011,15 @@
/*=========================================================================*/ /*=========================================================================*/
@@ -660,6 +661,15 @@ SLPError NetworkMcastRqstRply(const char @@ -317,6 +318,7 @@ SLPError NetworkRqstRply(int sock,
}
else
{
+ peeraddr = *destaddr;
maxwait = SLPPropertyAsInteger(SLPGetProperty("net.slp.unicastMaximumWait"));
SLPPropertyAsIntegerVector(SLPGetProperty("net.slp.unicastTimeouts"),
timeouts,
@@ -660,6 +662,15 @@ SLPError NetworkMcastRqstRply(const char
SLPIfaceInfo ifaceinfo; SLPIfaceInfo ifaceinfo;
SLPXcastSockets xcastsocks; SLPXcastSockets xcastsocks;
@ -2027,7 +2035,7 @@
#ifdef DEBUG #ifdef DEBUG
/* This function only supports multicast or broadcast of the following /* This function only supports multicast or broadcast of the following
* messages * messages
@@ -726,6 +736,7 @@ SLPError NetworkMcastRqstRply(const char @@ -726,6 +737,7 @@ SLPError NetworkMcastRqstRply(const char
/* SLP_FUNCT_DASRVRQST is a fake function. We really want to */ /* SLP_FUNCT_DASRVRQST is a fake function. We really want to */
/* send a SRVRQST */ /* send a SRVRQST */
buftype = SLP_FUNCT_SRVRQST; buftype = SLP_FUNCT_SRVRQST;
@ -2035,7 +2043,7 @@
} }
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
@@ -744,6 +755,13 @@ SLPError NetworkMcastRqstRply(const char @@ -744,6 +756,13 @@ SLPError NetworkMcastRqstRply(const char
*prlist = 0; *prlist = 0;
prlistlen = 0; prlistlen = 0;
@ -2049,7 +2057,7 @@
/*--------------------------*/ /*--------------------------*/
/* Main retransmission loop */ /* Main retransmission loop */
/*--------------------------*/ /*--------------------------*/
@@ -831,14 +849,23 @@ SLPError NetworkMcastRqstRply(const char @@ -831,14 +850,23 @@ SLPError NetworkMcastRqstRply(const char
/*----------------------*/ /*----------------------*/
/* send the send buffer */ /* send the send buffer */
/*----------------------*/ /*----------------------*/
@ -2081,7 +2089,7 @@
if(result != 0) if(result != 0)
{ {
/* we could not send the message for some reason */ /* we could not send the message for some reason */
@@ -851,20 +878,19 @@ SLPError NetworkMcastRqstRply(const char @@ -851,20 +879,19 @@ SLPError NetworkMcastRqstRply(const char
/*----------------*/ /*----------------*/
while(1) while(1)
{ {
@ -2115,7 +2123,7 @@
{ {
/* An error occured while receiving the message */ /* An error occured while receiving the message */
/* probably a just time out error. break for re-send. */ /* probably a just time out error. break for re-send. */
@@ -972,13 +998,16 @@ SLPError NetworkMcastRqstRply(const char @@ -972,13 +999,16 @@ SLPError NetworkMcastRqstRply(const char
goto CLEANUP; goto CLEANUP;
} }
@ -2139,7 +2147,7 @@
} }
} }
@@ -1016,8 +1045,11 @@ SLPError NetworkMcastRqstRply(const char @@ -1016,8 +1046,11 @@ SLPError NetworkMcastRqstRply(const char
/*----------------*/ /*----------------*/
if(prlist) xfree(prlist); if(prlist) xfree(prlist);
SLPBufferFree(sendbuf); SLPBufferFree(sendbuf);
@ -2151,7 +2159,7 @@
return result; return result;
} }
@@ -1190,6 +1222,7 @@ SLPError NetworkUcastRqstRply(PSLPHandle @@ -1190,6 +1223,7 @@ SLPError NetworkUcastRqstRply(PSLPHandle
/* send the send buffer */ /* send the send buffer */
/*----------------------*/ /*----------------------*/
@ -2160,7 +2168,7 @@
if ( handle->unicastsock >= 0 ) { if ( handle->unicastsock >= 0 ) {
retval1 = SLPNetworkSendMessage(handle->unicastsock, SOCK_STREAM, sendbuf, &(handle->unicastaddr), &timeout); retval1 = SLPNetworkSendMessage(handle->unicastsock, SOCK_STREAM, sendbuf, &(handle->unicastaddr), &timeout);
--- ./libslp/slp.h.orig 2003-04-21 11:26:54.000000000 +0000 --- ./libslp/slp.h.orig 2003-04-21 11:26:54.000000000 +0000
+++ ./libslp/slp.h 2006-11-16 16:42:16.000000000 +0000 +++ ./libslp/slp.h 2008-03-19 15:38:14.000000000 +0000
@@ -981,6 +981,41 @@ SLPEXP SLPError SLPAPI SLPParseAttrs(con @@ -981,6 +981,41 @@ SLPEXP SLPError SLPAPI SLPParseAttrs(con
/* was not found otherwise SLP_OK */ /* was not found otherwise SLP_OK */
/*=========================================================================*/ /*=========================================================================*/
@ -2204,7 +2212,7 @@
} }
#endif #endif
--- ./libslpattr/libslpattr.c.orig 2002-11-23 03:44:53.000000000 +0000 --- ./libslpattr/libslpattr.c.orig 2002-11-23 03:44:53.000000000 +0000
+++ ./libslpattr/libslpattr.c 2006-11-16 16:19:30.000000000 +0000 +++ ./libslpattr/libslpattr.c 2008-03-19 15:38:14.000000000 +0000
@@ -360,6 +360,11 @@ int find_value_list_end(char const *valu @@ -360,6 +360,11 @@ int find_value_list_end(char const *valu
(*cur)++; (*cur)++;
} }
@ -2218,7 +2226,7 @@
return 1; return 1;
} }
--- ./slpd/Makefile.am.orig 2002-03-19 23:52:15.000000000 +0000 --- ./slpd/Makefile.am.orig 2002-03-19 23:52:15.000000000 +0000
+++ ./slpd/Makefile.am 2006-11-16 16:19:30.000000000 +0000 +++ ./slpd/Makefile.am 2008-03-19 15:38:14.000000000 +0000
@@ -38,6 +38,7 @@ slpd_regfile.c \ @@ -38,6 +38,7 @@ slpd_regfile.c \
slpd_knownda.c \ slpd_knownda.c \
slpd_incoming.c \ slpd_incoming.c \
@ -2236,7 +2244,7 @@
slpd_LDADD = ../common/libcommonslpd.la \ slpd_LDADD = ../common/libcommonslpd.la \
--- ./slpd/slpd_database.c.orig 2003-03-19 05:03:21.000000000 +0000 --- ./slpd/slpd_database.c.orig 2003-03-19 05:03:21.000000000 +0000
+++ ./slpd/slpd_database.c 2006-11-16 16:19:30.000000000 +0000 +++ ./slpd/slpd_database.c 2008-03-19 15:38:14.000000000 +0000
@@ -69,6 +69,13 @@ @@ -69,6 +69,13 @@
#include "slp_xmalloc.h" #include "slp_xmalloc.h"
#include "slp_pid.h" #include "slp_pid.h"
@ -2510,7 +2518,7 @@
return 0; return 0;
} }
--- ./slpd/slpd_database.h.orig 2001-05-10 15:04:19.000000000 +0000 --- ./slpd/slpd_database.h.orig 2001-05-10 15:04:19.000000000 +0000
+++ ./slpd/slpd_database.h 2006-11-16 16:19:30.000000000 +0000 +++ ./slpd/slpd_database.h 2008-03-19 15:38:14.000000000 +0000
@@ -266,7 +266,7 @@ int SLPDDatabaseIsEmpty(); @@ -266,7 +266,7 @@ int SLPDDatabaseIsEmpty();
@ -2539,7 +2547,7 @@
/*=========================================================================*/ /*=========================================================================*/
void SLPDDatabaseDeinit(void); void SLPDDatabaseDeinit(void);
--- ./slpd/slpd_knownda.c.orig 2003-02-04 20:41:15.000000000 +0000 --- ./slpd/slpd_knownda.c.orig 2003-02-04 20:41:15.000000000 +0000
+++ ./slpd/slpd_knownda.c 2006-11-16 16:19:30.000000000 +0000 +++ ./slpd/slpd_knownda.c 2008-03-19 15:38:14.000000000 +0000
@@ -1640,7 +1640,7 @@ void SLPDKnownDARegisterWithAllDas(SLPMe @@ -1640,7 +1640,7 @@ void SLPDKnownDARegisterWithAllDas(SLPMe
/* Returns: None */ /* Returns: None */
/*=========================================================================*/ /*=========================================================================*/
@ -2550,7 +2558,7 @@
/* Simply echo the message through as is */ /* Simply echo the message through as is */
SLPDKnownDAEcho(msg,buf); SLPDKnownDAEcho(msg,buf);
--- ./slpd/slpd_log.c.orig 2002-12-03 21:04:53.000000000 +0000 --- ./slpd/slpd_log.c.orig 2002-12-03 21:04:53.000000000 +0000
+++ ./slpd/slpd_log.c 2006-11-16 16:19:30.000000000 +0000 +++ ./slpd/slpd_log.c 2008-03-19 15:38:14.000000000 +0000
@@ -271,6 +271,7 @@ void SLPDLogSrvTypeRqstMessage(SLPSrvTyp @@ -271,6 +271,7 @@ void SLPDLogSrvTypeRqstMessage(SLPSrvTyp
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
{ {
@ -2560,7 +2568,7 @@
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
--- ./slpd/slpd_main.c.orig 2002-12-03 21:04:53.000000000 +0000 --- ./slpd/slpd_main.c.orig 2002-12-03 21:04:53.000000000 +0000
+++ ./slpd/slpd_main.c 2006-11-16 16:19:30.000000000 +0000 +++ ./slpd/slpd_main.c 2008-03-19 15:38:14.000000000 +0000
@@ -54,6 +54,7 @@ @@ -54,6 +54,7 @@
#include "slpd_log.h" #include "slpd_log.h"
#include "slpd_socket.h" #include "slpd_socket.h"
@ -2709,8 +2717,8 @@
} }
/*----------------*/ /*----------------*/
--- ./slpd/slpd_mdns.c.orig 2006-11-16 16:19:30.000000000 +0000 --- ./slpd/slpd_mdns.c.orig 2008-03-19 15:38:14.000000000 +0000
+++ ./slpd/slpd_mdns.c 2006-11-16 16:19:30.000000000 +0000 +++ ./slpd/slpd_mdns.c 2008-03-19 15:38:14.000000000 +0000
@@ -0,0 +1,906 @@ @@ -0,0 +1,906 @@
+#include "slpd_mdns.h" +#include "slpd_mdns.h"
+#include "slpd_socket.h" +#include "slpd_socket.h"
@ -3618,8 +3626,8 @@
+#endif +#endif
+ return 0; + return 0;
+} +}
--- ./slpd/slpd_mdns.h.orig 2006-11-16 16:19:30.000000000 +0000 --- ./slpd/slpd_mdns.h.orig 2008-03-19 15:38:14.000000000 +0000
+++ ./slpd/slpd_mdns.h 2006-11-16 16:19:30.000000000 +0000 +++ ./slpd/slpd_mdns.h 2008-03-19 15:38:14.000000000 +0000
@@ -0,0 +1,50 @@ @@ -0,0 +1,50 @@
+#ifndef SLPD_MDNS_H_INCLUDE +#ifndef SLPD_MDNS_H_INCLUDE
+#define SLPD_MDNS_H_INCLUDE +#define SLPD_MDNS_H_INCLUDE
@ -3672,7 +3680,7 @@
+ +
+#endif +#endif
--- ./slpd/slpd_process.c.orig 2003-02-20 16:43:57.000000000 +0000 --- ./slpd/slpd_process.c.orig 2003-02-20 16:43:57.000000000 +0000
+++ ./slpd/slpd_process.c 2006-11-16 16:19:30.000000000 +0000 +++ ./slpd/slpd_process.c 2008-03-19 15:38:14.000000000 +0000
@@ -1331,11 +1331,14 @@ int SLPDProcessMessage(struct sockaddr_i @@ -1331,11 +1331,14 @@ int SLPDProcessMessage(struct sockaddr_i
SLPDLogMessage(SLPDLOG_TRACEMSG_IN,peerinfo,recvbuf); SLPDLogMessage(SLPDLOG_TRACEMSG_IN,peerinfo,recvbuf);
@ -3692,7 +3700,7 @@
/* zero out the header before parsing it */ /* zero out the header before parsing it */
memset(&header,0,sizeof(header)); memset(&header,0,sizeof(header));
--- ./slpd/slpd_property.c.orig 2002-06-11 17:25:40.000000000 +0000 --- ./slpd/slpd_property.c.orig 2002-06-11 17:25:40.000000000 +0000
+++ ./slpd/slpd_property.c 2006-11-16 16:19:30.000000000 +0000 +++ ./slpd/slpd_property.c 2008-03-19 15:38:14.000000000 +0000
@@ -65,6 +65,7 @@ @@ -65,6 +65,7 @@
/*=========================================================================*/ /*=========================================================================*/
@ -3833,7 +3841,7 @@
/*----------------------------------*/ /*----------------------------------*/
--- ./slpd/slpd_property.h.orig 2002-06-11 17:25:40.000000000 +0000 --- ./slpd/slpd_property.h.orig 2002-06-11 17:25:40.000000000 +0000
+++ ./slpd/slpd_property.h 2006-11-16 16:19:30.000000000 +0000 +++ ./slpd/slpd_property.h 2008-03-19 15:38:14.000000000 +0000
@@ -61,6 +61,8 @@ typedef struct _SLPDProperty @@ -61,6 +61,8 @@ typedef struct _SLPDProperty
{ {
int myUrlLen; int myUrlLen;
@ -3852,7 +3860,7 @@
const char* locale; const char* locale;
int isBroadcastOnly; int isBroadcastOnly;
--- ./slpd/slpd_regfile.c.orig 2002-03-19 23:52:15.000000000 +0000 --- ./slpd/slpd_regfile.c.orig 2002-03-19 23:52:15.000000000 +0000
+++ ./slpd/slpd_regfile.c 2006-11-16 16:19:30.000000000 +0000 +++ ./slpd/slpd_regfile.c 2008-03-19 15:38:14.000000000 +0000
@@ -153,6 +153,7 @@ int SLPDRegFileReadSrvReg(FILE* fd, @@ -153,6 +153,7 @@ int SLPDRegFileReadSrvReg(FILE* fd,
{ {
char* slider1; char* slider1;
@ -3920,8 +3928,8 @@
CLEANUP: CLEANUP:
--- ./slpd/slpd_socket.c.orig 2006-11-16 16:19:17.000000000 +0000 --- ./slpd/slpd_socket.c.orig 2002-12-03 21:04:54.000000000 +0000
+++ ./slpd/slpd_socket.c 2006-11-16 16:19:30.000000000 +0000 +++ ./slpd/slpd_socket.c 2008-03-19 15:38:14.000000000 +0000
@@ -412,6 +412,8 @@ SLPDSocket* SLPDSocketCreateBoundDatagra @@ -412,6 +412,8 @@ SLPDSocket* SLPDSocketCreateBoundDatagra
sock->fd = socket(PF_INET, SOCK_DGRAM, 0); sock->fd = socket(PF_INET, SOCK_DGRAM, 0);
if(sock->fd >=0) if(sock->fd >=0)
@ -3941,7 +3949,7 @@
{ {
if(listen(sock->fd,5) == 0) if(listen(sock->fd,5) == 0)
--- ./slpd/slpd_socket.h.orig 2002-12-03 21:04:54.000000000 +0000 --- ./slpd/slpd_socket.h.orig 2002-12-03 21:04:54.000000000 +0000
+++ ./slpd/slpd_socket.h 2006-11-16 16:19:30.000000000 +0000 +++ ./slpd/slpd_socket.h 2008-03-19 15:38:14.000000000 +0000
@@ -97,6 +97,7 @@ typedef struct _SLPDSocket @@ -97,6 +97,7 @@ typedef struct _SLPDSocket
int fd; int fd;
time_t age; /* in seconds */ time_t age; /* in seconds */
@ -3951,7 +3959,7 @@
/* Incoming socket stuff */ /* Incoming socket stuff */
--- ./slpd/slpd_spi.c.orig 2001-04-16 22:17:31.000000000 +0000 --- ./slpd/slpd_spi.c.orig 2001-04-16 22:17:31.000000000 +0000
+++ ./slpd/slpd_spi.c 2006-11-16 16:19:30.000000000 +0000 +++ ./slpd/slpd_spi.c 2008-03-19 15:38:14.000000000 +0000
@@ -68,6 +68,8 @@ int SLPDSpiInit(const char* spifile) @@ -68,6 +68,8 @@ int SLPDSpiInit(const char* spifile)
} }
@ -3962,7 +3970,7 @@
} }
--- ./slptool/slptool.c.orig 2003-04-21 11:19:19.000000000 +0000 --- ./slptool/slptool.c.orig 2003-04-21 11:19:19.000000000 +0000
+++ ./slptool/slptool.c 2006-11-16 16:47:44.000000000 +0000 +++ ./slptool/slptool.c 2008-03-19 15:38:14.000000000 +0000
@@ -329,6 +329,20 @@ SLPBoolean mySrvUrlCallback( SLPHandle h @@ -329,6 +329,20 @@ SLPBoolean mySrvUrlCallback( SLPHandle h
{ {
if(errcode == SLP_OK) if(errcode == SLP_OK)
@ -4024,7 +4032,7 @@
{ {
cmdline->cmd = FINDSRVS; cmdline->cmd = FINDSRVS;
--- ./slptool/slptool.h.orig 2003-04-21 11:17:58.000000000 +0000 --- ./slptool/slptool.h.orig 2003-04-21 11:17:58.000000000 +0000
+++ ./slptool/slptool.h 2006-11-16 16:19:30.000000000 +0000 +++ ./slptool/slptool.h 2008-03-19 15:38:14.000000000 +0000
@@ -40,6 +40,8 @@ @@ -40,6 +40,8 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>

10
openslp.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Mar 25 19:27:21 CET 2008 - mls@suse.de
- fix non-intel little-endian platforms [bnc#372179]
-------------------------------------------------------------------
Wed Mar 19 16:45:21 CET 2008 - mls@suse.de
- initialize peeraddr in unicast case [bnc#370374]
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 4 15:12:28 CEST 2007 - mls@suse.de Tue Sep 4 15:12:28 CEST 2007 - mls@suse.de

11
openslp.fixaddrcheck.diff Normal file
View File

@ -0,0 +1,11 @@
--- common/slp_message.h.orig 2008-03-25 19:26:00.000000000 +0100
+++ common/slp_message.h 2008-03-25 19:26:18.000000000 +0100
@@ -495,7 +495,7 @@
/*=========================================================================*/
-#ifdef i386
+#if 1
/*=========================================================================*/
/* Macros to check in_addr */

107
openslp.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package openslp (Version 1.2.0) # spec file for package openslp (Version 1.2.0)
# #
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine # This file and all modifications and additions to the pristine
# package are under the same license as the package itself. # package are under the same license as the package itself.
# #
@ -10,14 +10,15 @@
# norootforbuild # norootforbuild
Name: openslp Name: openslp
BuildRequires: bison flex openssl-devel BuildRequires: bison flex openssl-devel
Summary: An OpenSLP Implementation of Service Location Protocol V2 Summary: An OpenSLP Implementation of Service Location Protocol V2
Version: 1.2.0 Version: 1.2.0
Release: 91 Release: 126
License: BSD 3-Clause, GPL v2 or later License: BSD 3-Clause; GPL v2 or later
Group: System/Daemons Group: System/Daemons
URL: http://www.openslp.org/ Url: http://www.openslp.org/
PreReq: %fillup_prereq %insserv_prereq PreReq: %fillup_prereq %insserv_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %name-%version.tar.bz2 Source0: %name-%version.tar.bz2
@ -41,6 +42,7 @@ Patch11: openslp.truncate.diff
Patch12: openslp.emptyanswer.diff Patch12: openslp.emptyanswer.diff
Patch13: openslp.doubleequal.diff Patch13: openslp.doubleequal.diff
Patch14: openslp.dereg.diff Patch14: openslp.dereg.diff
Patch15: openslp.fixaddrcheck.diff
%description %description
Service Location Protocol is an IETF standards track protocol that Service Location Protocol is an IETF standards track protocol that
@ -132,6 +134,7 @@ Authors:
%patch12 %patch12
%patch13 %patch13
%patch14 %patch14
%patch15
autoreconf --force --install autoreconf --force --install
%build %build
@ -256,76 +259,80 @@ rm -rf $RPM_BUILD_ROOT
%_libdir/libslp.so %_libdir/libslp.so
%changelog %changelog
* Tue Sep 04 2007 - mls@suse.de * Tue Mar 25 2008 mls@suse.de
- fix non-intel little-endian platforms [bnc#372179]
* Wed Mar 19 2008 mls@suse.de
- initialize peeraddr in unicast case [bnc#370374]
* Tue Sep 04 2007 mls@suse.de
- fix typo in dereg code [#290333] - fix typo in dereg code [#290333]
* Thu Mar 29 2007 - rguenther@suse.de * Thu Mar 29 2007 rguenther@suse.de
- add bison and flex BuildRequires - add bison and flex BuildRequires
* Thu Jan 11 2007 - ro@suse.de * Thu Jan 11 2007 ro@suse.de
- move omc xml file to /usr/share/omc - move omc xml file to /usr/share/omc
* Mon Jan 08 2007 - ro@suse.de * Mon Jan 08 2007 ro@suse.de
- move srvinfo.d to svcinfo.d (typo in fate entry) - move srvinfo.d to svcinfo.d (typo in fate entry)
* Mon Dec 18 2006 - ro@suse.de * Mon Dec 18 2006 ro@suse.de
- added slpd.xml to /etc/omc/srvinfo.d (fate#301831) - added slpd.xml to /etc/omc/srvinfo.d (fate#301831)
* Thu Nov 16 2006 - mls@suse.de * Thu Nov 16 2006 mls@suse.de
- truncate oversized udp messages, finally fixes [#185483] - truncate oversized udp messages, finally fixes [#185483]
(can be turned of with "net.slp.oversizedUDP" option) (can be turned of with "net.slp.oversizedUDP" option)
- do not try to send back empty answers - do not try to send back empty answers
- add option "net.slp.allowDoubleEqualInPredicate" to make openslp - add option "net.slp.allowDoubleEqualInPredicate" to make openslp
work with some buggy clients that use "==" for comparison [#95043] work with some buggy clients that use "==" for comparison [#95043]
- changed SLPGetPeer interface to support IPv6 - changed SLPGetPeer interface to support IPv6
* Tue Sep 12 2006 - mls@suse.de * Tue Sep 12 2006 mls@suse.de
- obey OVERFLOW bit of incoming udp messages [#185483] - obey OVERFLOW bit of incoming udp messages [#185483]
- use right length in send() calls [#185483] - use right length in send() calls [#185483]
- fix errno check in IncomingStreamWrite - fix errno check in IncomingStreamWrite
- add SLPGetPeer method in libslp - add SLPGetPeer method in libslp
- add --peerinfo option to slptool to print peerinfo - add --peerinfo option to slptool to print peerinfo
* Wed May 10 2006 - mls@suse.de * Wed May 10 2006 mls@suse.de
- fix unaligned memory access on ia64 [#171932] - fix unaligned memory access on ia64 [#171932]
* Fri Mar 24 2006 - mls@suse.de * Fri Mar 24 2006 mls@suse.de
- fix listening on multiple interfaces [#160008] - fix listening on multiple interfaces [#160008]
* Sat Mar 18 2006 - schwab@suse.de * Sat Mar 18 2006 schwab@suse.de
- Fix file descritor leak [#159303]. - Fix file descritor leak [#159303].
* Mon Jan 30 2006 - mls@suse.de * Mon Jan 30 2006 mls@suse.de
- fix bug in DropSLPMulticastGroup - fix bug in DropSLPMulticastGroup
- add -fstack-protector to CFLAGS - add -fstack-protector to CFLAGS
- added logrotate script [#143069] - added logrotate script [#143069]
* Wed Jan 25 2006 - mls@suse.de * Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires - converted neededforbuild to BuildRequires
* Fri Dec 23 2005 - mls@suse.de * Fri Dec 23 2005 mls@suse.de
- clear overflow bit on TCP connections [#135248] - clear overflow bit on TCP connections [#135248]
* Thu Sep 29 2005 - dmueller@suse.de * Thu Sep 29 2005 dmueller@suse.de
- add norootforbuild - add norootforbuild
* Mon Aug 22 2005 - mls@suse.de * Mon Aug 22 2005 mls@suse.de
- also listen on SLPv1 General Multicast address [#64138] - also listen on SLPv1 General Multicast address [#64138]
- use poll instead of select [#65673] - use poll instead of select [#65673]
* Tue Feb 15 2005 - mls@suse.de * Tue Feb 15 2005 mls@suse.de
- update to version 1.2.0 - update to version 1.2.0
- fixed security audit findings - fixed security audit findings
- disable mdns in slpd for now, libslp still supports it - disable mdns in slpd for now, libslp still supports it
* Fri Dec 03 2004 - mls@suse.de * Fri Dec 03 2004 mls@suse.de
- fix slpv DA discovery scope handling (#48728) - fix slpv DA discovery scope handling (#48728)
- use _dns-sd instead of _mdns in mdns findsrvtypes query (#48325) - use _dns-sd instead of _mdns in mdns findsrvtypes query (#48325)
* Thu Oct 14 2004 - adrian@suse.de * Thu Oct 14 2004 adrian@suse.de
- add meta information for suse help. - add meta information for suse help.
* Sun Jun 13 2004 - bg@suse.de * Sun Jun 13 2004 bg@suse.de
- reduce hardcoded optimization from -O3 to -O2 to circumvent - reduce hardcoded optimization from -O3 to -O2 to circumvent
ICE on hppa ICE on hppa
* Tue Jun 01 2004 - mls@suse.de * Tue Jun 01 2004 mls@suse.de
- added fillup and insserv prereq - added fillup and insserv prereq
* Thu May 27 2004 - mls@suse.de * Thu May 27 2004 mls@suse.de
- use /proc/net/tcp_listen and /proc/net/tcp6_listen if - use /proc/net/tcp_listen and /proc/net/tcp6_listen if
available to keep things fast on systems with lots of available to keep things fast on systems with lots of
network connections [#40888] network connections [#40888]
* Wed May 05 2004 - mls@suse.de * Wed May 05 2004 mls@suse.de
- treat empty attributes as illegal [#39669] - treat empty attributes as illegal [#39669]
- always start slpd on SLES [#39863] - always start slpd on SLES [#39863]
* Fri Apr 23 2004 - mls@suse.de * Fri Apr 23 2004 mls@suse.de
- libslp: use configured TTL settings [#39030] - libslp: use configured TTL settings [#39030]
* Fri Apr 02 2004 - mls@suse.de * Fri Apr 02 2004 mls@suse.de
- beta is over, don't always start slpd - beta is over, don't always start slpd
* Fri Apr 02 2004 - kukuk@suse.de * Fri Apr 02 2004 kukuk@suse.de
- Fix init script - Fix init script
* Wed Mar 31 2004 - mls@suse.de * Wed Mar 31 2004 mls@suse.de
- fix sighup processing - fix sighup processing
- clean up spi code - clean up spi code
- fix spi null pointer reference - fix spi null pointer reference
@ -333,71 +340,71 @@ rm -rf $RPM_BUILD_ROOT
- added try-restart to rcslpd - added try-restart to rcslpd
- fix slp.conf re-read - fix slp.conf re-read
- fix prlist buffer overrun - fix prlist buffer overrun
* Mon Mar 29 2004 - mls@suse.de * Mon Mar 29 2004 mls@suse.de
- turn around srvtypes order in mdns - turn around srvtypes order in mdns
* Thu Mar 18 2004 - mls@suse.de * Thu Mar 18 2004 mls@suse.de
- code cleanup - code cleanup
- provide A RR with SRV RRs - provide A RR with SRV RRs
- don't pack .xvpics - don't pack .xvpics
* Fri Mar 12 2004 - mls@suse.de * Fri Mar 12 2004 mls@suse.de
- added missing SLPGetMDNSName prototype to slp.h - added missing SLPGetMDNSName prototype to slp.h
* Fri Mar 12 2004 - mls@suse.de * Fri Mar 12 2004 mls@suse.de
- slpd: fix hostname detection segfault - slpd: fix hostname detection segfault
- slpd: use ttl 255 for mdns - slpd: use ttl 255 for mdns
- slpd: put attrs in mdns TXT RR - slpd: put attrs in mdns TXT RR
- libslp: check mdns ttl - libslp: check mdns ttl
- libslp: make getattr work with mdns - libslp: make getattr work with mdns
- libslp: make mdns name available via new SLPGetMDNSName() function - libslp: make mdns name available via new SLPGetMDNSName() function
* Thu Mar 04 2004 - mls@suse.de * Thu Mar 04 2004 mls@suse.de
- libslp: add scope/nameingauth/predicate to query - libslp: add scope/nameingauth/predicate to query
- slpd: reply to mdns service requests - slpd: reply to mdns service requests
- slpd: don't play DA if our hostname expands to loopback - slpd: don't play DA if our hostname expands to loopback
- slpd: fix null pointer reference if SrvReg request is sent - slpd: fix null pointer reference if SrvReg request is sent
over tcp (as done by apple) over tcp (as done by apple)
* Fri Feb 27 2004 - mls@suse.de * Fri Feb 27 2004 mls@suse.de
- slpd: check port status every 15 seconds for watch-port-tcp/udp - slpd: check port status every 15 seconds for watch-port-tcp/udp
entries entries
- libslp: send MDNS queries for scope _mdns - libslp: send MDNS queries for scope _mdns
* Sun Feb 15 2004 - adrian@suse.de * Sun Feb 15 2004 adrian@suse.de
- export full qualified hostnames for $HOSTNAME - export full qualified hostnames for $HOSTNAME
- replace several $HOSTNAME tags in a srvurl - replace several $HOSTNAME tags in a srvurl
- do only accept .reg files (no .rpmsave for instance) - do only accept .reg files (no .rpmsave for instance)
* Sat Feb 14 2004 - adrian@suse.de * Sat Feb 14 2004 adrian@suse.de
- fix /proc/net/tcp* parsing - fix /proc/net/tcp* parsing
- ONLY FOR BETA: start slpd always - ONLY FOR BETA: start slpd always
* Thu Jan 29 2004 - adrian@suse.de * Thu Jan 29 2004 adrian@suse.de
- fix reading from slpd.reg.d directory - fix reading from slpd.reg.d directory
(was broken since chroot run) (was broken since chroot run)
* Wed Jan 14 2004 - adrian@suse.de * Wed Jan 14 2004 adrian@suse.de
- slptool register now services with max timeout. - slptool register now services with max timeout.
* Tue Dec 16 2003 - adrian@suse.de * Tue Dec 16 2003 adrian@suse.de
- fix sig11 when using the library without spi file - fix sig11 when using the library without spi file
* Mon Dec 08 2003 - adrian@suse.de * Mon Dec 08 2003 adrian@suse.de
- security enhancements: - security enhancements:
* use chroot and open needed file descriptors before * use chroot and open needed file descriptors before
* panic if chroot or setuid fails * panic if chroot or setuid fails
* pid-file= option in reg files is useless now, so * pid-file= option in reg files is useless now, so
tcp-port= must be used for this now tcp-port= must be used for this now
- add SSL support again - add SSL support again
* Wed Nov 26 2003 - adrian@suse.de * Wed Nov 26 2003 adrian@suse.de
- add buffer fix from cvs - add buffer fix from cvs
- add README.SuSE with config howto - add README.SuSE with config howto
* Thu Nov 20 2003 - adrian@suse.de * Thu Nov 20 2003 adrian@suse.de
- drop the multicast route creation in runlevel script. - drop the multicast route creation in runlevel script.
we do not need it anymore with 1.1.5 we do not need it anymore with 1.1.5
* Wed Nov 19 2003 - adrian@suse.de * Wed Nov 19 2003 adrian@suse.de
- update to version 1.1.5 - update to version 1.1.5
* development version, but it contains lots of fixes * development version, but it contains lots of fixes
- use $HOSTNAME instead of $LOCALHOST in reg files - use $HOSTNAME instead of $LOCALHOST in reg files
* Fri Nov 14 2003 - adrian@suse.de * Fri Nov 14 2003 adrian@suse.de
- use correct keyword "X-UnitedLinux-Should-Start" in init script - use correct keyword "X-UnitedLinux-Should-Start" in init script
(seen by Martin Vidner) (seen by Martin Vidner)
* Thu Nov 13 2003 - adrian@suse.de * Thu Nov 13 2003 adrian@suse.de
- add "tcp-port=" option to test services running via (x)inted - add "tcp-port=" option to test services running via (x)inted
- start after (x)inetd - start after (x)inetd
* Wed Nov 12 2003 - adrian@suse.de * Wed Nov 12 2003 adrian@suse.de
- add code to parse .reg files from any package below /etc/slp.reg.d/ - add code to parse .reg files from any package below /etc/slp.reg.d/
* Sun Nov 09 2003 - adrian@suse.de * Mon Nov 10 2003 adrian@suse.de
- fix security issue in init script - fix security issue in init script
* Sat Nov 08 2003 - adrian@suse.de * Sat Nov 08 2003 adrian@suse.de
- initial package of version 1.0.11 - initial package of version 1.0.11