*/
#include "includes.h"
+#include "system/network.h"
+#include "librpc/gen_ndr/ndr_epmapper.h"
/*
display any protocol tower
*/
-static void display_tower(TALLOC_CTX *mem_ctx, struct epm_towers *twr)
+static void display_tower(TALLOC_CTX *mem_ctx, struct epm_tower *twr)
{
int i;
const char *uuid;
for (i=0;i<twr->num_floors;i++) {
struct epm_lhs *lhs = &twr->floors[i].lhs;
- struct epm_rhs *rhs = &twr->floors[i].rhs;
- switch (lhs->protocol) {
- case EPM_PROTOCOL_NCACN_DNET_NSP:
- printf(" DNET/NSP");
- break;
-
+ union epm_rhs *rhs = &twr->floors[i].rhs;
+
+ switch(lhs->protocol) {
case EPM_PROTOCOL_UUID:
uuid = GUID_string(mem_ctx, &lhs->info.uuid.uuid);
if (strcasecmp(uuid, NDR_GUID) == 0) {
}
break;
- case EPM_PROTOCOL_NCACN_RPC_C:
+ case EPM_PROTOCOL_NCACN:
printf(" RPC-C");
break;
- case EPM_PROTOCOL_NCACN_IP:
+ case EPM_PROTOCOL_NCADG:
+ printf(" RPC");
+ break;
+
+ case EPM_PROTOCOL_NCALRPC:
+ printf(" NCALRPC");
+ break;
+
+ case EPM_PROTOCOL_DNET_NSP:
+ printf(" DNET/NSP");
+ break;
+
+ case EPM_PROTOCOL_IP:
printf(" IP:");
- if (rhs->rhs_data.length == 4) {
- struct in_addr in;
- in.s_addr = IVAL(rhs->rhs_data.data, 0);
- printf("%s", inet_ntoa(in));
+ {
+ struct ipv4_addr in;
+ in.addr = htonl(rhs->ip.address);
+ printf("%s", sys_inet_ntoa(in));
}
break;
- case EPM_PROTOCOL_NCACN_PIPE:
- printf(" PIPE:%.*s", rhs->rhs_data.length, rhs->rhs_data.data);
+ case EPM_PROTOCOL_PIPE:
+ printf(" PIPE:%s", rhs->pipe.path);
break;
- case EPM_PROTOCOL_NCACN_SMB:
- printf(" SMB:%.*s", rhs->rhs_data.length, rhs->rhs_data.data);
+ case EPM_PROTOCOL_SMB:
+ printf(" SMB:%s", rhs->smb.unc);
break;
- case EPM_PROTOCOL_NCACN_NETBIOS:
- printf(" NetBIOS:%.*s", rhs->rhs_data.length, rhs->rhs_data.data);
+ case EPM_PROTOCOL_UNIX_DS:
+ printf(" Unix:%s", rhs->unix_ds.path);
break;
- case EPM_PROTOCOL_NCACN_NB_NB:
- printf(" NB_NB");
+ case EPM_PROTOCOL_NETBIOS:
+ printf(" NetBIOS:%s", rhs->netbios.name);
break;
- case EPM_PROTOCOL_NCACN_SPX:
+ case EPM_PROTOCOL_NETBEUI:
+ printf(" NETBeui");
+ break;
+
+ case EPM_PROTOCOL_SPX:
printf(" SPX");
break;
- /*
- case EPM_PROTOCOL_NCACN_NB_IPX:
+ case EPM_PROTOCOL_NB_IPX:
printf(" NB_IPX");
- break;*/
-
- case 0x01:
- printf(" UNK(1):%.*s", rhs->rhs_data.length, rhs->rhs_data.data);
break;
- case EPM_PROTOCOL_NCACN_HTTP:
- printf(" HTTP:");
- if (rhs->rhs_data.length == 2) {
- printf("%d", RSVAL(rhs->rhs_data.data, 0));
- }
+ case EPM_PROTOCOL_HTTP:
+ printf(" HTTP:%d", rhs->http.port);
break;
- case EPM_PROTOCOL_NCACN_TCP:
+ case EPM_PROTOCOL_TCP:
/* what is the difference between this and 0x1f? */
- printf(" TCP:");
- if (rhs->rhs_data.length == 2) {
- printf("%d", RSVAL(rhs->rhs_data.data, 0));
- }
+ printf(" TCP:%d", rhs->tcp.port);
break;
- case EPM_PROTOCOL_NCADG_UDP:
- printf(" UDP:");
+ case EPM_PROTOCOL_UDP:
+ printf(" UDP:%d", rhs->udp.port);
break;
default:
printf(" UNK(%02x):", lhs->protocol);
- if (rhs->rhs_data.length == 2) {
- printf("%d", RSVAL(rhs->rhs_data.data, 0));
+ if (rhs->unknown.length == 2) {
+ printf("%d", RSVAL(rhs->unknown.data, 0));
}
break;
}
r.out.entry_handle = &handle;
r.in.max_towers = 100;
- if (twr->towers.num_floors != 5) {
- printf(" tower has %d floors - skipping test_Map\n", twr->towers.num_floors);
- return True;
- }
-
- uuid_str = GUID_string(mem_ctx, &twr->towers.floors[0].lhs.info.uuid.uuid);
+ uuid_str = GUID_string(mem_ctx, &twr->tower.floors[0].lhs.info.uuid.uuid);
printf("epm_Map results for '%s':\n",
- idl_pipe_name(uuid_str, twr->towers.floors[0].lhs.info.uuid.version));
+ idl_pipe_name(uuid_str, twr->tower.floors[0].lhs.info.uuid.version));
- twr->towers.floors[2].lhs.protocol = EPM_PROTOCOL_NCACN_RPC_C;
- twr->towers.floors[2].lhs.info.lhs_data = data_blob(NULL, 0);
- twr->towers.floors[2].rhs.rhs_data = data_blob_talloc_zero(p->mem_ctx, 2);
+ twr->tower.floors[2].lhs.protocol = EPM_PROTOCOL_NCACN;
+ twr->tower.floors[2].lhs.info.lhs_data = data_blob(NULL, 0);
+ twr->tower.floors[2].rhs.ncacn.minor_version = 0;
- twr->towers.floors[3].lhs.protocol = EPM_PROTOCOL_NCACN_TCP;
- twr->towers.floors[3].lhs.info.lhs_data = data_blob(NULL, 0);
- twr->towers.floors[3].rhs.rhs_data = data_blob_talloc_zero(p->mem_ctx, 2);
+ twr->tower.floors[3].lhs.protocol = EPM_PROTOCOL_TCP;
+ twr->tower.floors[3].lhs.info.lhs_data = data_blob(NULL, 0);
+ twr->tower.floors[3].rhs.tcp.port = 0;
- twr->towers.floors[4].lhs.protocol = EPM_PROTOCOL_NCACN_IP;
- twr->towers.floors[4].lhs.info.lhs_data = data_blob(NULL, 0);
- twr->towers.floors[4].rhs.rhs_data = data_blob_talloc_zero(p->mem_ctx, 4);
+ twr->tower.floors[4].lhs.protocol = EPM_PROTOCOL_IP;
+ twr->tower.floors[4].lhs.info.lhs_data = data_blob(NULL, 0);
+ twr->tower.floors[4].rhs.ip.address = 0;
status = dcerpc_epm_Map(p, mem_ctx, &r);
if (NT_STATUS_IS_OK(status) && r.out.result == 0) {
for (i=0;i<r.out.num_towers;i++) {
if (r.out.towers[i].twr) {
- display_tower(mem_ctx, &r.out.towers[i].twr->towers);
+ display_tower(mem_ctx, &r.out.towers[i].twr->tower);
}
}
}
- twr->towers.floors[3].lhs.protocol = EPM_PROTOCOL_NCACN_HTTP;
- twr->towers.floors[3].lhs.info.lhs_data = data_blob(NULL, 0);
- twr->towers.floors[3].rhs.rhs_data = data_blob_talloc_zero(p->mem_ctx, 2);
+ twr->tower.floors[3].lhs.protocol = EPM_PROTOCOL_HTTP;
+ twr->tower.floors[3].lhs.info.lhs_data = data_blob(NULL, 0);
+ twr->tower.floors[3].rhs.http.port = 0;
status = dcerpc_epm_Map(p, mem_ctx, &r);
if (NT_STATUS_IS_OK(status) && r.out.result == 0) {
for (i=0;i<r.out.num_towers;i++) {
if (r.out.towers[i].twr) {
- display_tower(mem_ctx, &r.out.towers[i].twr->towers);
+ display_tower(mem_ctx, &r.out.towers[i].twr->tower);
}
}
}
- twr->towers.floors[3].lhs.protocol = EPM_PROTOCOL_NCACN_SMB;
- twr->towers.floors[3].lhs.info.lhs_data = data_blob(NULL, 0);
- twr->towers.floors[3].rhs.rhs_data = data_blob_talloc_zero(p->mem_ctx, 2);
+ twr->tower.floors[3].lhs.protocol = EPM_PROTOCOL_UDP;
+ twr->tower.floors[3].lhs.info.lhs_data = data_blob(NULL, 0);
+ twr->tower.floors[3].rhs.http.port = 0;
- twr->towers.floors[4].lhs.protocol = EPM_PROTOCOL_NCACN_NETBIOS;
- twr->towers.floors[4].lhs.info.lhs_data = data_blob(NULL, 0);
- twr->towers.floors[4].rhs.rhs_data = data_blob_talloc_zero(p->mem_ctx, 2);
+ status = dcerpc_epm_Map(p, mem_ctx, &r);
+ if (NT_STATUS_IS_OK(status) && r.out.result == 0) {
+ for (i=0;i<r.out.num_towers;i++) {
+ if (r.out.towers[i].twr) {
+ display_tower(mem_ctx, &r.out.towers[i].twr->tower);
+ }
+ }
+ }
+
+ twr->tower.floors[3].lhs.protocol = EPM_PROTOCOL_SMB;
+ twr->tower.floors[3].lhs.info.lhs_data = data_blob(NULL, 0);
+ twr->tower.floors[3].rhs.smb.unc = "";
+
+ twr->tower.floors[4].lhs.protocol = EPM_PROTOCOL_NETBIOS;
+ twr->tower.floors[4].lhs.info.lhs_data = data_blob(NULL, 0);
+ twr->tower.floors[4].rhs.netbios.name = "";
status = dcerpc_epm_Map(p, mem_ctx, &r);
if (NT_STATUS_IS_OK(status) && r.out.result == 0) {
for (i=0;i<r.out.num_towers;i++) {
if (r.out.towers[i].twr) {
- display_tower(mem_ctx, &r.out.towers[i].twr->towers);
+ display_tower(mem_ctx, &r.out.towers[i].twr->tower);
}
}
}
+
+ /* FIXME: Extend to do other protocols as well (ncacn_unix_stream, ncalrpc) */
return True;
}
}
for (i=0;i<r.out.num_ents;i++) {
printf("\nFound '%s'\n", r.out.entries[i].annotation);
- display_tower(mem_ctx, &r.out.entries[i].tower->towers);
- test_Map(p, mem_ctx, r.out.entries[i].tower);
+ display_tower(mem_ctx, &r.out.entries[i].tower->tower);
+ if (r.out.entries[i].tower->tower.num_floors == 5) {
+ test_Map(p, mem_ctx, r.out.entries[i].tower);
+ }
}
} while (NT_STATUS_IS_OK(status) &&
r.out.result == 0 &&
return True;
}
-BOOL torture_rpc_epmapper(int dummy)
+static BOOL test_InqObject(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
+{
+ NTSTATUS status;
+ struct epm_InqObject r;
+
+ r.in.epm_object = talloc_p(mem_ctx, struct GUID);
+ GUID_from_string(DCERPC_EPMAPPER_UUID, r.in.epm_object);
+
+ status = dcerpc_epm_InqObject(p, mem_ctx, &r);
+ if (NT_STATUS_IS_ERR(status)) {
+ printf("InqObject failed - %s\n", nt_errstr(status));
+ return False;
+ }
+
+ return True;
+}
+
+BOOL torture_rpc_epmapper(void)
{
NTSTATUS status;
struct dcerpc_pipe *p;
ret = False;
}
+ if (!test_InqObject(p, mem_ctx)) {
+ ret = False;
+ }
+
talloc_destroy(mem_ctx);
- torture_rpc_close(p);
+ torture_rpc_close(p);
return ret;
}