mirror of
https://github.com/samba-team/samba.git
synced 2025-03-10 12:58:35 +03:00
s3: libsmb: namequery.c: Remove unused remove_duplicate_addrs2().
Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Noel Power <noel.power@suse.com>
This commit is contained in:
parent
5b6245d14b
commit
d627ef1488
@ -1229,61 +1229,6 @@ static void sort_sa_list(struct samba_sockaddr *salist, size_t count)
|
|||||||
TYPESAFE_QSORT(salist, count, samba_sockaddr_compare);
|
TYPESAFE_QSORT(salist, count, samba_sockaddr_compare);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if 0
|
|
||||||
/**********************************************************************
|
|
||||||
Remove any duplicate address/port pairs in the list
|
|
||||||
*********************************************************************/
|
|
||||||
|
|
||||||
size_t remove_duplicate_addrs2(struct ip_service *iplist, size_t count )
|
|
||||||
{
|
|
||||||
size_t i, j;
|
|
||||||
|
|
||||||
DEBUG(10,("remove_duplicate_addrs2: "
|
|
||||||
"looking for duplicate address/port pairs\n"));
|
|
||||||
|
|
||||||
/* One loop to set duplicates to a zero addr. */
|
|
||||||
for ( i=0; i<count; i++ ) {
|
|
||||||
bool ok;
|
|
||||||
struct samba_sockaddr sa_i = {0};
|
|
||||||
|
|
||||||
ok = sockaddr_storage_to_samba_sockaddr(&sa_i, &iplist[i].ss);
|
|
||||||
if (!ok) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (is_zero_addr(&sa_i.u.ss)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
for ( j=i+1; j<count; j++ ) {
|
|
||||||
struct samba_sockaddr sa_j = {0};
|
|
||||||
|
|
||||||
ok = sockaddr_storage_to_samba_sockaddr(&sa_j,
|
|
||||||
&iplist[j].ss);
|
|
||||||
if (!ok) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (sockaddr_equal(&sa_i.u.sa, &sa_j.u.sa) &&
|
|
||||||
iplist[i].port == iplist[j].port) {
|
|
||||||
zero_sockaddr(&iplist[j].ss);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Now remove any addresses set to zero above. */
|
|
||||||
for (i = 0; i < count; i++) {
|
|
||||||
while (i < count &&
|
|
||||||
is_zero_addr(&iplist[i].ss)) {
|
|
||||||
ARRAY_DEL_ELEMENT(iplist, i, count);
|
|
||||||
count--;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return count;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**********************************************************************
|
/**********************************************************************
|
||||||
Remove any duplicate address/port pairs in the samba_sockaddr array.
|
Remove any duplicate address/port pairs in the samba_sockaddr array.
|
||||||
*********************************************************************/
|
*********************************************************************/
|
||||||
|
@ -47,7 +47,6 @@ bool name_status_find(const char *q_name,
|
|||||||
int type,
|
int type,
|
||||||
const struct sockaddr_storage *to_ss,
|
const struct sockaddr_storage *to_ss,
|
||||||
fstring name);
|
fstring name);
|
||||||
size_t remove_duplicate_addrs2(struct ip_service *iplist, size_t count );
|
|
||||||
size_t remove_duplicate_addrs2_sa(struct samba_sockaddr *salist, size_t count);
|
size_t remove_duplicate_addrs2_sa(struct samba_sockaddr *salist, size_t count);
|
||||||
struct tevent_req *name_query_send(TALLOC_CTX *mem_ctx,
|
struct tevent_req *name_query_send(TALLOC_CTX *mem_ctx,
|
||||||
struct tevent_context *ev,
|
struct tevent_context *ev,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user