Update of /cvsroot/playerstage/code/player/libplayersd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14533/libplayersd
Modified Files:
playersd.h playersd_mdns.c
Added Files:
.cvsignore Makefile.am playersd.pc.in
Log Message:
added build of libplayersd
--- NEW FILE: playersd.pc.in ---
# DO NOT edit playersd.pc; edit playersd.pc.in instead
[EMAIL PROTECTED]@
Name: playersd
Description: Player service discovery library - part of the Player Project
Version: @VERSION@
Requires: playererror playerutils
Libs: -L${prefix}/lib -lplayersd @EXTRA_DNS_SD_LIBS@
Cflags: -I${prefix}/include/[EMAIL PROTECTED]@[EMAIL PROTECTED]@
Index: playersd_mdns.c
===================================================================
RCS file: /cvsroot/playerstage/code/player/libplayersd/playersd_mdns.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** playersd_mdns.c 25 Sep 2007 21:06:56 -0000 1.5
--- playersd_mdns.c 25 Sep 2007 23:53:50 -0000 1.6
***************
*** 148,153 ****
player_sd_register(player_sd_t* sd,
const char* name,
! player_devaddr_t addr,
! int timeout)
{
DNSServiceErrorType sdErr;
--- 148,152 ----
player_sd_register(player_sd_t* sd,
const char* name,
! player_devaddr_t addr)
{
DNSServiceErrorType sdErr;
***************
*** 157,162 ****
player_sd_mdns_dev_t* dev;
char nameBuf[PLAYER_SD_NAME_MAXLEN];
- //struct pollfd ufds[1];
- //int numready;
// Find a spot for this device
--- 156,159 ----
***************
*** 236,275 ****
return(-1);
}
- #if 0
- // mDNSResponder will return the kDNSServiceErr_NameConflict by callback.
- // Unfortunately, Avahi never invokes our callback (!). So we poll
- // with timeout.
- while(!dev->valid && !dev->fail)
- {
- ufds[0].fd = DNSServiceRefSockFD(dev->regRef);
- ufds[0].events = POLLIN;
- if((numready = poll(ufds,1,timeout)) < 0)
- {
- if(errno == EAGAIN)
- continue;
- else
- {
- PLAYER_ERROR1("poll returned error: %s\n", strerror(errno));
- DNSServiceRefDeallocate(dev->regRef);
- return(-1);
- }
- }
- else if(numready > 0)
- {
- DNSServiceProcessResult(dev->regRef);
- }
- else
- {
- // Timed out. Not necessarily an error.
- break;
- }
- }
-
- if(dev->fail)
- {
- PLAYER_ERROR1("Registration of %s failed", name);
- return(-1);
- }
- #endif
else
{
--- 233,236 ----
***************
*** 292,341 ****
void *context)
{
! #if 0
! DNSServiceErrorType sdErr;
! player_sd_mdns_dev_t* dev = (player_sd_mdns_dev_t*)context;
! char nameBuf[PLAYER_SD_NAME_MAXLEN];
!
! printf("registerCB: %d\n", errorCode);
! if(errorCode == kDNSServiceErr_NoError)
! {
! dev->valid = 1;
! }
! else if(errorCode == kDNSServiceErr_NameConflict)
! {
! // Pick a new name
! memset(nameBuf,0,sizeof(nameBuf));
! snprintf(nameBuf,sizeof(nameBuf),"%s(%d)",
! dev->sdDev.name,dev->nameIdx++);
!
! PLAYER_WARN2("Renaming device %s to %s",
! dev->sdDev.name, nameBuf);
!
! // Close the old connection
! DNSServiceRefDeallocate(dev->regRef);
!
! // Redo the registration
! if((sdErr = DNSServiceRegister(&(dev->regRef),
! 0,
! 0,
! nameBuf,
! PLAYER_SD_SERVICENAME,
! NULL,
! NULL,
! dev->sdDev.addr.robot,
! TXTRecordGetLength(&(dev->txtRecord)),
! TXTRecordGetBytesPtr(&(dev->txtRecord)),
! registerCB,
! (void*)dev)) != kDNSServiceErr_NoError)
! {
! PLAYER_ERROR1("DNSServiceRegister returned error: %d", sdErr);
! dev->fail = 1;
! }
! }
! else
! {
! PLAYER_ERROR1("registerCB received error: %d", errorCode);
! dev->fail = 1;
! }
! #endif
}
--- 253,256 ----
void *context)
{
! // Don't need to do anything here
}
--- NEW FILE: Makefile.am ---
AM_CPPFLAGS = -g -fPIC -Wall -I$(top_srcdir)
lib_LTLIBRARIES =
pkgconfig_DATA =
pkginclude_HEADERS =
if HAVE_DNS_SD_H
lib_LTLIBRARIES += libplayersd.la
pkgconfig_DATA += playersd.pc
pkginclude_HEADERS += playersd.h
endif
# create the pkg-config entry for the server headers
pkgconfigdir = $(libdir)/pkgconfig
pkgincludedir =
$(includedir)/player-$(PLAYER_MAJOR_VERSION).$(PLAYER_MINOR_VERSION)/libplayersd
EXTRA_DIST = playersd.pc.in
CLEANFILES = playersd.pc
libplayersd_la_SOURCES = playersd_mdns.c playersd.h
libplayersd_la_LDFLAGS = $(PLAYER_VERSION_INFO) -rpath $(libdir)
$(top_builddir)/libplayercore/libplayererror.la
$(top_builddir)/libplayercore/libplayerutils.la
--- NEW FILE: .cvsignore ---
Makefile
Makefile.in
playersd.pc
Index: playersd.h
===================================================================
RCS file: /cvsroot/playerstage/code/player/libplayersd/playersd.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** playersd.h 25 Sep 2007 21:00:33 -0000 1.3
--- playersd.h 25 Sep 2007 23:53:50 -0000 1.4
***************
*** 84,89 ****
int player_sd_register(player_sd_t* sd,
const char* name,
! player_devaddr_t addr,
! int timeout);
// Unregister (terminate) the named device. Returns 0 on success, non-zero
--- 84,88 ----
int player_sd_register(player_sd_t* sd,
const char* name,
! player_devaddr_t addr);
// Unregister (terminate) the named device. Returns 0 on success, non-zero
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
