[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Tue Sep 28 17:49:33 MDT 2010
The branch, master has been updated
via 115ad60 midltests: add a midltests_tcp.exe tool
via cf4e572 midltests: move the current implementation to midltests_simple.exe
via d8a0436 testprogs/win32: add vs2010-metze.cmd
from ec33a87 s3-printing: skip metadata entry when traversing printerlist.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 115ad6012540338a73abd9de13c6bb4de3a12cf2
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Sep 28 11:04:59 2010 +0200
midltests: add a midltests_tcp.exe tool
This uses a man in the middle approach in order to dump the
request and response pdus.
It also tests NDR32 and NDR64.
metze
commit cf4e57281b867878521d6f38ec5b0f552c4d2c90
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Sep 28 10:50:05 2010 +0200
midltests: move the current implementation to midltests_simple.exe
metze
commit d8a0436fb4d61e16a04a8249ece79d563ae2e3cd
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Sep 28 09:47:55 2010 +0200
testprogs/win32: add vs2010-metze.cmd
metze
-----------------------------------------------------------------------
Summary of changes:
testprogs/win32/midltests/Makefile | 33 +-
.../win32/midltests/{Makefile => Makefile.simple} | 12 +-
testprogs/win32/midltests/Makefile.tcp | 22 +
testprogs/win32/midltests/midltests_marshall.c | 6 +-
testprogs/win32/midltests/midltests_marshall.h | 7 +-
.../midltests/{midltests.c => midltests_simple.c} | 0
testprogs/win32/midltests/midltests_tcp.c | 573 ++++++++++++++++++++
testprogs/win32/vs2010-metze.cmd | 24 +
8 files changed, 646 insertions(+), 31 deletions(-)
copy testprogs/win32/midltests/{Makefile => Makefile.simple} (65%)
create mode 100644 testprogs/win32/midltests/Makefile.tcp
rename testprogs/win32/midltests/{midltests.c => midltests_simple.c} (100%)
create mode 100644 testprogs/win32/midltests/midltests_tcp.c
create mode 100644 testprogs/win32/vs2010-metze.cmd
Changeset truncated at 500 lines:
diff --git a/testprogs/win32/midltests/Makefile b/testprogs/win32/midltests/Makefile
index 535968b..ded98e9 100644
--- a/testprogs/win32/midltests/Makefile
+++ b/testprogs/win32/midltests/Makefile
@@ -1,27 +1,16 @@
-INCLUDES=-I
-CFLAGS=$(INCLUDES) -Zi -D_WIN32_WINNT=0x502
-LIBS=rpcrt4.lib
-all: midltests.exe
+all:
+ @echo "nmake targets:"
+ @echo " clean"
+ @echo " simple"
+ @echo " tcp"
clean:
- del *~ *.obj *.exe midltests.h midltests_s.c midltests_c.c
+ @call nmake /f Makefile.simple /A /NOLOGO clean
+ @call nmake /f Makefile.tcp /A /NOLOGO clean
-#MIDL_ARGS=/target NT50
-MIDL_ARGS=/Os /prefix client cli_ /prefix server srv_ /prefix switch swi_
-midltests.h midltests_s.c midltests_c.c: midltests.idl midltests.acf
- midl $(MIDL_ARGS) /acf midltests.acf midltests.idl
+simple:
+ @call nmake /f Makefile.simple /A /NOLOGO all
-MIDLTESTS_OBJ = midltests.obj midltests_s_m.obj midltests_c_m.obj midltests_marshall.obj utils.obj
-midltests.exe: $(MIDLTESTS_OBJ)
- $(CC) -o midltests.exe $(MIDLTESTS_OBJ) $(LIBS)
-
-midltests.obj: midltests.h midltests.idl
-midltests_c_m.c: midltests_c.c
-midltests_s_m.c: midltests_s.c
-
-midltests.obj: midltests.h midltests.idl midltests.c
-midltests_s_m.obj: midltests_marshall.h midltests_s.c midltests_s_m.c
-midltests_c_m.obj: midltests_marshall.h midltests_c.c midltests_c_m.c
-midltests_marshall.obj: midltests.h midltests_marshall.c
-utils.obj: midltests.h utils.c
+tcp:
+ @call nmake /f Makefile.tcp /A /NOLOGO all
diff --git a/testprogs/win32/midltests/Makefile b/testprogs/win32/midltests/Makefile.simple
similarity index 65%
copy from testprogs/win32/midltests/Makefile
copy to testprogs/win32/midltests/Makefile.simple
index 535968b..ec4a542 100644
--- a/testprogs/win32/midltests/Makefile
+++ b/testprogs/win32/midltests/Makefile.simple
@@ -2,7 +2,7 @@ INCLUDES=-I
CFLAGS=$(INCLUDES) -Zi -D_WIN32_WINNT=0x502
LIBS=rpcrt4.lib
-all: midltests.exe
+all: midltests_simple.exe
clean:
del *~ *.obj *.exe midltests.h midltests_s.c midltests_c.c
@@ -12,15 +12,15 @@ MIDL_ARGS=/Os /prefix client cli_ /prefix server srv_ /prefix switch swi_
midltests.h midltests_s.c midltests_c.c: midltests.idl midltests.acf
midl $(MIDL_ARGS) /acf midltests.acf midltests.idl
-MIDLTESTS_OBJ = midltests.obj midltests_s_m.obj midltests_c_m.obj midltests_marshall.obj utils.obj
-midltests.exe: $(MIDLTESTS_OBJ)
- $(CC) -o midltests.exe $(MIDLTESTS_OBJ) $(LIBS)
+MIDLTESTS_OBJ = midltests_simple.obj midltests_s_m.obj midltests_c_m.obj midltests_marshall.obj utils.obj
+midltests_simple.exe: $(MIDLTESTS_OBJ)
+ $(CC) -o midltests_simple.exe $(MIDLTESTS_OBJ) $(LIBS)
-midltests.obj: midltests.h midltests.idl
+midltests_simple.obj: midltests.h midltests.idl
midltests_c_m.c: midltests_c.c
midltests_s_m.c: midltests_s.c
-midltests.obj: midltests.h midltests.idl midltests.c
+midltests_simple.obj: midltests.h midltests.idl midltests_simple.c
midltests_s_m.obj: midltests_marshall.h midltests_s.c midltests_s_m.c
midltests_c_m.obj: midltests_marshall.h midltests_c.c midltests_c_m.c
midltests_marshall.obj: midltests.h midltests_marshall.c
diff --git a/testprogs/win32/midltests/Makefile.tcp b/testprogs/win32/midltests/Makefile.tcp
new file mode 100644
index 0000000..19c1f11
--- /dev/null
+++ b/testprogs/win32/midltests/Makefile.tcp
@@ -0,0 +1,22 @@
+INCLUDES=-I
+CFLAGS=$(INCLUDES) -Zi -D_WIN32_WINNT=0x610
+LIBS=rpcrt4.lib ws2_32.lib
+
+all: midltests_tcp.exe
+
+clean:
+ del *~ *.obj *.exe midltests.h midltests_s.c midltests_c.c
+
+MIDL_ARGS=/target NT60 /prefix client cli_ /prefix server srv_ /prefix switch swi_
+midltests.h midltests_s.c midltests_c.c: midltests.idl midltests.acf
+ midl $(MIDL_ARGS) /acf midltests.acf midltests.idl
+
+MIDLTESTS_OBJ = midltests_tcp.obj midltests_s.obj midltests_c.obj midltests_marshall.obj utils.obj
+midltests_tcp.exe: $(MIDLTESTS_OBJ)
+ $(CC) -o midltests_tcp.exe $(MIDLTESTS_OBJ) $(LIBS)
+
+midltests_tcp.obj: midltests.h midltests.idl
+
+midltests_tcp.obj: midltests.h midltests.idl midltests_tcp.c
+midltests_marshall.obj: midltests.h midltests_marshall.c
+utils.obj: midltests.h utils.c
diff --git a/testprogs/win32/midltests/midltests_marshall.c b/testprogs/win32/midltests/midltests_marshall.c
index e772afd..f0fc78a 100644
--- a/testprogs/win32/midltests/midltests_marshall.c
+++ b/testprogs/win32/midltests/midltests_marshall.c
@@ -30,7 +30,7 @@ static void print_asc(const unsigned char *buf,int len)
printf("%c", isprint(buf[i])?buf[i]:'.');
}
-static void dump_data(const unsigned char *buf1,int len)
+void dump_data(const unsigned char *buf1,int len)
{
const unsigned char *buf = (const unsigned char *)buf1;
int i=0;
@@ -61,6 +61,8 @@ static void dump_data(const unsigned char *buf1,int len)
}
}
+#if _WIN32_WINNT < 0x600
+
void NdrGetBufferMarshall(PMIDL_STUB_MESSAGE stubmsg, unsigned long len, RPC_BINDING_HANDLE hnd)
{
stubmsg->RpcMsg->Buffer = HeapAlloc(GetProcessHeap(), 0, len);
@@ -119,3 +121,5 @@ RPC_STATUS WINAPI I_RpcGetBufferMarshall(PRPC_MESSAGE RpcMsg)
memset(RpcMsg->Buffer, 0xcd, RpcMsg->BufferLength);
return 0;
}
+
+#endif /* _WIN32_WINNT < 0x600 */
diff --git a/testprogs/win32/midltests/midltests_marshall.h b/testprogs/win32/midltests/midltests_marshall.h
index 0c6aed2..8bb59b9 100644
--- a/testprogs/win32/midltests/midltests_marshall.h
+++ b/testprogs/win32/midltests/midltests_marshall.h
@@ -1,5 +1,9 @@
#include "rpc.h"
#include "rpcndr.h"
+
+void dump_data(const unsigned char *buf1,int len);
+
+#if _WIN32_WINNT < 0x600
#define NdrSendReceive NdrSendReceiveMarshall
void NdrSendReceiveMarshall(PMIDL_STUB_MESSAGE stubmsg, unsigned char *buffer);
#define NdrGetBuffer NdrGetBufferMarshall
@@ -11,6 +15,5 @@ void NdrServerInitializeNewMarshall(PRPC_MESSAGE pRpcMsg,
#define I_RpcGetBuffer I_RpcGetBufferMarshall
RPC_STATUS WINAPI I_RpcGetBufferMarshall(PRPC_MESSAGE pMsg);
-
-
+#endif /* _WIN32_WINNT < 0x600 */
diff --git a/testprogs/win32/midltests/midltests.c b/testprogs/win32/midltests/midltests_simple.c
similarity index 100%
rename from testprogs/win32/midltests/midltests.c
rename to testprogs/win32/midltests/midltests_simple.c
diff --git a/testprogs/win32/midltests/midltests_tcp.c b/testprogs/win32/midltests/midltests_tcp.c
new file mode 100644
index 0000000..ca01c62
--- /dev/null
+++ b/testprogs/win32/midltests/midltests_tcp.c
@@ -0,0 +1,573 @@
+/*
+ MIDLTESTS client.
+
+ Copyright (C) Stefan Metzmacher 2008
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <winsock.h>
+#include "midltests.h"
+
+#ifndef _M_AMD64
+#error "please run 'vcvarsall.bat amd64' -midltests_tcp needs 64-bit support!"
+#endif
+
+#define MIDLTESTS_C_CODE 1
+#include "midltests.idl"
+
+#ifndef LISTEN_IP
+#define LISTEN_IP "127.0.0.1"
+#endif
+
+#ifndef FORWARD_IP
+#define FORWARD_IP "127.0.0.1"
+#endif
+
+#ifndef CONNECT_IP
+#define CONNECT_IP "127.0.0.1"
+#endif
+
+struct NDRTcpThreadCtx;
+
+struct NDRProxyThreadCtx {
+ const struct NDRTcpThreadCtx *ctx;
+ SOCKET InSocket;
+ SOCKET OutSocket;
+ DWORD dwThreadId;
+ HANDLE hThread;
+};
+
+struct NDRTcpThreadCtx {
+ const char *name;
+ short listen_port;
+ short client_port;
+ BOOL ndr64;
+ BOOL stop;
+};
+
+struct dcerpc_header {
+ BYTE rpc_vers; /* RPC version */
+ BYTE rpc_vers_minor; /* Minor version */
+ BYTE ptype; /* Packet type */
+ BYTE pfc_flags; /* Fragmentation flags */
+ BYTE drep[4]; /* NDR data representation */
+ short frag_length; /* Total length of fragment */
+ short auth_length; /* authenticator length */
+ DWORD call_id; /* Call identifier */
+};
+
+static void dump_packet(const char *ctx, const char *direction,
+ const unsigned char *buf, int len)
+{
+ struct dcerpc_header *hdr = (struct dcerpc_header *)buf;
+
+ if (len < sizeof(struct dcerpc_header)) {
+ printf("%s:%s: invalid dcerpc pdu len(%d)\n",
+ ctx, direction, len);
+ fflush(stdout);
+ return;
+ }
+
+ if (hdr->rpc_vers != 5 || hdr->rpc_vers_minor != 0) {
+ printf("%s:%s: invalid dcerpc pdu len(%d) ver:%d min:%d\n",
+ ctx, direction, len,
+ hdr->rpc_vers, hdr->rpc_vers_minor);
+ fflush(stdout);
+ return;
+ }
+
+ if (hdr->frag_length != len) {
+ printf("%s:%s: invalid dcerpc pdu len(%d) should be (%d)\n",
+ ctx, direction, len, hdr->frag_length);
+ fflush(stdout);
+ return;
+ }
+
+
+ switch (hdr->ptype) {
+ case 0: /* request */
+ printf("%s:%s: ptype[request] flen[%d] plen[%d]\n\n",
+ ctx, direction, hdr->frag_length,
+ len - 24);
+ dump_data(buf + 24, len - 24);
+ printf("\n");
+ fflush(stdout);
+ break;
+
+ case 2: /* response */
+ printf("\n%s:%s: ptype[response] flen[%d] plen[%d]\n\n",
+ ctx, direction, hdr->frag_length,
+ len - 24);
+ dump_data(buf + 24, len - 24);
+ printf("\n");
+ fflush(stdout);
+ break;
+
+ case 11: /* bind */
+#if 0
+ printf("%s:%s: ptype[bind] flen[%d] call[%d] contexts[%d]\n\n"
+ ctx, direction, hdr->frag_length, hdr->call_id,
+ buf[24]);
+ dump_data(buf + 24, len - 24);
+ printf("\n");
+ fflush(stdout);
+#endif
+ break;
+
+ case 12: /* bind ack */
+#if 0
+ printf("%s:%s: ptype[bind_ack] flen[%d] call[%d]\n\n",
+ ctx, direction, hdr->frag_length, hdr->call_id);
+ fflush(stdout);
+#endif
+ break;
+
+ case 14: /* alter_req */
+#if 1
+ printf("%s:%s: ptype[alter_req] flen[%d] call[%d] contexts[%d]\n\n",
+ ctx, direction, hdr->frag_length, hdr->call_id,
+ buf[24]);
+ //dump_data(buf + 24, len - 24);
+ printf("\n");
+ fflush(stdout);
+#endif
+ break;
+
+ case 15: /* alter_ack */
+#if 1
+ printf("%s:%s: ptype[alter_ack] flen[%d] call[%d]\n\n",
+ ctx, direction, hdr->frag_length, hdr->call_id);
+ fflush(stdout);
+#endif
+ break;
+
+ default:
+ printf("%s:%s: ptype[%d] flen[%d] call[%d]\n\n",
+ ctx, direction, hdr->ptype, hdr->frag_length, hdr->call_id);
+ fflush(stdout);
+ break;
+ }
+}
+
+static void change_packet(const char *ctx, BOOL ndr64,
+ unsigned char *buf, int len)
+{
+ struct dcerpc_header *hdr = (struct dcerpc_header *)buf;
+
+ if (len < sizeof(struct dcerpc_header)) {
+ printf("%s: invalid dcerpc pdu len(%d)\n",
+ ctx, len);
+ fflush(stdout);
+ return;
+ }
+
+ if (hdr->rpc_vers != 5 || hdr->rpc_vers_minor != 0) {
+ printf("%s: invalid dcerpc pdu len(%d) ver:%d min:%d\n",
+ ctx, len,
+ hdr->rpc_vers, hdr->rpc_vers_minor);
+ fflush(stdout);
+ return;
+ }
+
+ if (hdr->frag_length != len) {
+ printf("%s: invalid dcerpc pdu len(%d) should be (%d)\n",
+ ctx, len, hdr->frag_length);
+ fflush(stdout);
+ return;
+ }
+
+ switch (hdr->ptype) {
+ case 11: /* bind */
+ if (buf[24] == 3 && !ndr64) {
+ buf[24+0x48] = 0xFF;
+ printf("%s: disable NDR64\n\n", ctx);
+ } else if (buf[24] < 3 && ndr64) {
+ buf[24] = 0x00;
+ printf("\n\tERROR!!!\n\n");
+ printf("%s: disable NDR32\n", ctx);
+ printf("\n");
+ printf("You may need to run 'vcvarsall.bat amd64' before 'nmake tcp'\n");
+ } else {
+ printf("%s: got NDR64\n\n", ctx);
+ }
+ //printf("%s: bind with %u pres\n", ctx, buf[24]);
+ fflush(stdout);
+ break;
+ }
+}
+
+DWORD WINAPI NDRProxyThread(LPVOID lpParameter)
+{
+ struct NDRProxyThreadCtx *p = (struct NDRProxyThreadCtx *)lpParameter;
+
+ while (!p->ctx->stop) {
+ int r, s;
+ int ret = -1;
+ BYTE buf[5840];
+
+ r = recv(p->InSocket, buf, sizeof(buf), 0);
+ if (r <= 0) {
+ ret = WSAGetLastError();
+ printf("%s: recv(in) failed[%d][%d]\n", p->ctx->name, r, ret);
+ fflush(stdout);
+ goto next;
+ }
+
+ change_packet(p->ctx->name, p->ctx->ndr64, buf, r);
+ fflush(stdout);
+
+ dump_packet(p->ctx->name, "in => out", buf, r);
+ fflush(stdout);
+
+ s = send(p->OutSocket, buf, r, 0);
+ if (s <= 0) {
+ ret = WSAGetLastError();
+ printf("%s: send(out) failed[%d][%d]\n", p->ctx->name, s, ret);
+ fflush(stdout);
+ goto next;
+ }
+
+ r = recv(p->OutSocket, buf, sizeof(buf), 0);
+ if (r <= 0) {
+ ret = WSAGetLastError();
+ printf("%s: recv(out) failed[%d][%d]\n", p->ctx->name, r, ret);
+ fflush(stdout);
+ goto next;
+ }
+
+ dump_packet(p->ctx->name, "out => in", buf, r);
+ fflush(stdout);
+
+ s = send(p->InSocket, buf, r, 0);
+ if (s <= 0) {
+ ret = WSAGetLastError();
+ printf("%s: send(in) failed[%d][%d]\n", p->ctx->name, s, ret);
+ fflush(stdout);
+ goto next;
+ }
+
+ }
+next:
+ closesocket(p->InSocket);
+ closesocket(p->OutSocket);
+
+ printf("NDRTcpThread[%s] stop\n", p->ctx->name);
+ fflush(stdout);
+ return 0;
+}
+
+DWORD WINAPI NDRTcpThread(LPVOID lpParameter)
+{
+ struct NDRTcpThreadCtx *ctx = (struct NDRTcpThreadCtx *)lpParameter;
+ int ret = -1;
+ SOCKET ListenSocket;
+ struct sockaddr_in saServer;
+ struct sockaddr_in saClient;
+
+ //printf("NDRTcpThread[%s] start\n", ctx->name);
+ fflush(stdout);
+
+ ListenSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+ if (ListenSocket == INVALID_SOCKET) {
+ ret = WSAGetLastError();
+ printf("socket() failed[%d][%d]\n", ListenSocket, ret);
+ fflush(stdout);
+ goto failed;
+ }
+
+ saServer.sin_family = AF_INET;
+ saServer.sin_addr.s_addr = inet_addr(LISTEN_IP);
+ saServer.sin_port = htons(ctx->listen_port);
+
+ saClient.sin_family = AF_INET;
+ saClient.sin_addr.s_addr = inet_addr(FORWARD_IP);
+ saClient.sin_port = htons(ctx->client_port);
+
+ ret = bind(ListenSocket, (SOCKADDR*)&saServer, sizeof(saServer));
+ if (ret == SOCKET_ERROR) {
+ ret = WSAGetLastError();
+ printf("bind() failed[%d]\n", ret);
+ fflush(stdout);
+ goto failed;
+ }
+
+ ret = listen(ListenSocket, 10);
+ if (ret == SOCKET_ERROR) {
+ ret = WSAGetLastError();
+ printf("listen() failed[%d]\n", ret);
+ fflush(stdout);
+ goto failed;
+ }
+
+ while (!ctx->stop) {
+ struct sockaddr_in sa;
+ int sa_len = sizeof(sa);
+ struct NDRProxyThreadCtx *p = malloc(sizeof(*p));
+ p->ctx = ctx;
+
+ p->InSocket = accept(ListenSocket, (SOCKADDR *)&sa, &sa_len);
+ if (p->InSocket == INVALID_SOCKET) {
+ ret = WSAGetLastError();
+ printf("%s: accept() failed[%d][%d]\n", p->ctx->name, p->InSocket, ret);
+ fflush(stdout);
+ continue;
+ }
+
+ p->OutSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+ if (p->OutSocket == INVALID_SOCKET) {
--
Samba Shared Repository
More information about the samba-cvs
mailing list