qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[BZ #5010] 

2007-10-06  Ulrich Drepper  <drepper@redhat.com>
	[BZ #5010]
	* sunrpc/svc.c (struct svc_callout): Add sc_mapped element.
	(svc_register): Initialize sc_mapped.  Set to TRUE if call to
	map service succeeded.
	(svc_is_mapped): New function.
	(svc_unregister): Use it before trying to unmap service.
This commit is contained in:
Ulrich Drepper 2007-10-06 17:31:01 +00:00
parent d10737e480
commit 718946816c
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2007-10-06 Ulrich Drepper <drepper@redhat.com>
[BZ #5010]
* sunrpc/svc.c (struct svc_callout): Add sc_mapped element.
(svc_register): Initialize sc_mapped. Set to TRUE if call to
map service succeeded.
(svc_is_mapped): New function.
(svc_unregister): Use it before trying to unmap service.
2007-10-05 Ulrich Drepper <drepper@redhat.com> 2007-10-05 Ulrich Drepper <drepper@redhat.com>
* timezone/zic.c: Update from tzcode2007h. * timezone/zic.c: Update from tzcode2007h.

23
sunrpc/svc.c
View File

@ -61,6 +61,7 @@ struct svc_callout {
rpcprog_t sc_prog; rpcprog_t sc_prog;
rpcvers_t sc_vers; rpcvers_t sc_vers;
void (*sc_dispatch) (struct svc_req *, SVCXPRT *); void (*sc_dispatch) (struct svc_req *, SVCXPRT *);
bool_t sc_mapped;
}; };
#ifdef _RPC_THREAD_SAFE_ #ifdef _RPC_THREAD_SAFE_
#define svc_head RPC_THREAD_VARIABLE(svc_head_s) #define svc_head RPC_THREAD_VARIABLE(svc_head_s)
@ -160,6 +161,17 @@ done:
return s; return s;
} }
static bool_t
svc_is_mapped (rpcprog_t prog, rpcvers_t vers)
{
struct svc_callout *prev;
register struct svc_callout *s;
s = svc_find (prog, vers, &prev);
return s!= NULL_SVC && s->sc_mapped;
}
/* Add a service program to the callout list. /* Add a service program to the callout list.
The dispatch routine will be called when a rpc request for this The dispatch routine will be called when a rpc request for this
program number comes in. */ program number comes in. */
@ -185,12 +197,18 @@ svc_register (SVCXPRT * xprt, rpcprog_t prog, rpcvers_t vers,
s->sc_vers = vers; s->sc_vers = vers;
s->sc_dispatch = dispatch; s->sc_dispatch = dispatch;
s->sc_next = svc_head; s->sc_next = svc_head;
s->sc_mapped = FALSE;
svc_head = s; svc_head = s;
pmap_it: pmap_it:
/* now register the information with the local binder service */ /* now register the information with the local binder service */
if (protocol) if (protocol)
return pmap_set (prog, vers, protocol, xprt->xp_port); {
if (! pmap_set (prog, vers, protocol, xprt->xp_port))
return FALSE;
s->sc_mapped = TRUE;
}
return TRUE; return TRUE;
} }
@ -214,7 +232,8 @@ svc_unregister (rpcprog_t prog, rpcvers_t vers)
s->sc_next = NULL_SVC; s->sc_next = NULL_SVC;
mem_free ((char *) s, (u_int) sizeof (struct svc_callout)); mem_free ((char *) s, (u_int) sizeof (struct svc_callout));
/* now unregister the information with the local binder service */ /* now unregister the information with the local binder service */
pmap_unset (prog, vers); if (! svc_is_mapped (prog, vers))
pmap_unset (prog, vers);
} }
libc_hidden_def (svc_unregister) libc_hidden_def (svc_unregister)