sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-10-23 11:33:16 +03:00
Code Activity

r19638: convert resolve.c to the new composite api

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher
2006-11-08 21:18:24 +00:00
committed by Gerald (Jerry) Carter
parent 73e3f7efa7
commit 617f9c70c1
1 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
source/libcli/resolve/resolve.c
View File

@@ -123,49 +123,45 @@ struct composite_context *resolve_name_send(struct nbt_name *name, struct event_
{ {
struct composite_context *c; struct composite_context *c;
struct resolve_state *state; struct resolve_state *state;
NTSTATUS status;
c = talloc_zero(NULL, struct composite_context); c = composite_create(event_ctx, event_ctx);
if (c == NULL) goto failed; if (c == NULL) return NULL;
state = talloc(c, struct resolve_state); if (methods == NULL) {
if (state == NULL) goto failed; composite_error(c, NT_STATUS_INVALID_PARAMETER);
return c;
status = nbt_name_dup(state, name, &state->name); }
if (!NT_STATUS_IS_OK(status)) goto failed;
if (methods == NULL) goto failed;
state->methods = str_list_copy(state, methods);
if (state->methods == NULL) goto failed;
c->state = COMPOSITE_STATE_IN_PROGRESS;
c->private_data = state;
if (event_ctx == NULL) { if (event_ctx == NULL) {
c->event_ctx = event_context_init(c); c->event_ctx = event_context_init(c);
if (c->event_ctx == NULL) goto failed;
} else { } else {
c->event_ctx = talloc_reference(c, event_ctx); c->event_ctx = talloc_reference(c, event_ctx);
} }
if (composite_nomem(c->event_ctx, c)) return c;
state = talloc(c, struct resolve_state);
if (composite_nomem(state, c)) return c;
c->private_data = state;
c->status = nbt_name_dup(state, name, &state->name);
if (!composite_is_ok(c)) return c;
state->methods = str_list_copy(state, methods);
if (composite_nomem(state->methods, c)) return c;
if (is_ipaddress(state->name.name) || if (is_ipaddress(state->name.name) ||
strcasecmp(state->name.name, "localhost") == 0) { strcasecmp(state->name.name, "localhost") == 0) {
struct ipv4_addr ip = interpret_addr2(state->name.name); struct ipv4_addr ip = interpret_addr2(state->name.name);
state->reply_addr = talloc_strdup(state, sys_inet_ntoa(ip)); state->reply_addr = talloc_strdup(state, sys_inet_ntoa(ip));
if (!state->reply_addr) goto failed; if (composite_nomem(state->reply_addr, c)) return c;
composite_done(c); composite_done(c);
return c; return c;
} }
state->creq = setup_next_method(c); state->creq = setup_next_method(c);
if (state->creq == NULL) goto failed; if (composite_nomem(state->creq, c)) return c;
return c; return c;
failed:
talloc_free(c);
return NULL;
} }
/* /*