Skip to content

Commit 85ea14b

Browse files
fcneufjengelh
fcneuf
authored and
jengelh
committed
rpc_lib: replace old define names
1 parent 83ca4cf commit 85ea14b

File tree

8 files changed

+373
-420
lines changed

8 files changed

+373
-420
lines changed

‎exch/emsmdb/emsmdb_ndr.cpp‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <gromox/ndr.hpp>
55
#include "emsmdb_interface.hpp"
66
#include "emsmdb_ndr.hpp"
7-
#define TRY(expr) do { pack_result klfdv{expr}; if (klfdv != NDR_ERR_SUCCESS) return klfdv; } while (false)
7+
#define TRY(expr) do { pack_result klfdv{expr}; if (klfdv != pack_result::ok) return klfdv; } while (false)
88

99
static pack_result asyncemsmdb_ndr_pull_ecdoasyncwaitex(NDR_PULL *pndr,
1010
ECDOASYNCWAITEX_IN *r)
@@ -26,10 +26,10 @@ pack_result asyncemsmdb_ndr_pull(int opnum, NDR_PULL *pndr, void **ppin)
2626
case ecDoAsyncWaitEx:
2727
*ppin = ndr_stack_anew<ECDOASYNCWAITEX_IN>(NDR_STACK_IN);
2828
if (*ppin == nullptr)
29-
return NDR_ERR_ALLOC;
29+
return pack_result::alloc;
3030
return asyncemsmdb_ndr_pull_ecdoasyncwaitex(pndr, static_cast<ECDOASYNCWAITEX_IN *>(*ppin));
3131
default:
32-
return NDR_ERR_BAD_SWITCH;
32+
return pack_result::bad_switch;
3333
}
3434
}
3535

@@ -39,7 +39,7 @@ pack_result asyncemsmdb_ndr_push(int opnum, NDR_PUSH *pndr, void *pout)
3939
case ecDoAsyncWaitEx:
4040
return asyncemsmdb_ndr_push_ecdoasyncwaitex(pndr, static_cast<ECDOASYNCWAITEX_OUT *>(pout));
4141
default:
42-
return NDR_ERR_BAD_SWITCH;
42+
return pack_result::bad_switch;
4343
}
4444
}
4545

@@ -65,21 +65,21 @@ static pack_result emsmdb_ndr_pull_ecrregisterpushnotification(NDR_PULL *pndr,
6565
TRY(pndr->g_ulong(&size));
6666
r->pctx = ndr_stack_anew<uint8_t>(NDR_STACK_IN, size);
6767
if (r->pctx == nullptr)
68-
return NDR_ERR_ALLOC;
68+
return pack_result::alloc;
6969
TRY(pndr->g_uint8_a(r->pctx, size));
7070
TRY(pndr->g_uint16(&r->cb_ctx));
7171
if (r->cb_ctx != size)
72-
return NDR_ERR_ARRAY_SIZE;
72+
return pack_result::array_size;
7373
TRY(pndr->g_uint32(&r->advise_bits));
7474
TRY(pndr->g_ulong(&size));
7575
r->paddr = ndr_stack_anew<uint8_t>(NDR_STACK_IN, size);
7676
if (r->paddr == nullptr)
77-
return NDR_ERR_ALLOC;
77+
return pack_result::alloc;
7878
TRY(pndr->g_uint8_a(r->paddr, size));
7979
TRY(pndr->g_uint16(&r->cb_addr));
8080
if (r->cb_addr != size)
81-
return NDR_ERR_ARRAY_SIZE;
82-
return NDR_ERR_SUCCESS;
81+
return pack_result::array_size;
82+
return pack_result::ok;
8383
}
8484

8585
static pack_result emsmdb_ndr_push_ecrregisterpushnotification(NDR_PUSH *pndr,
@@ -105,7 +105,7 @@ static pack_result emsmdb_ndr_pull_ecdoconnectex(NDR_PULL *pndr, ECDOCONNECTEX_I
105105
TRY(pndr->g_ulong(&offset));
106106
TRY(pndr->g_ulong(&length));
107107
if (offset != 0 || length > size || length > 1024)
108-
return NDR_ERR_ARRAY_SIZE;
108+
return pack_result::array_size;
109109
TRY(pndr->check_str(length, sizeof(uint8_t)));
110110
TRY(pndr->g_str(r->puserdn, length));
111111
TRY(pndr->g_uint32(&r->flags));
@@ -125,15 +125,15 @@ static pack_result emsmdb_ndr_pull_ecdoconnectex(NDR_PULL *pndr, ECDOCONNECTEX_I
125125
TRY(pndr->g_ulong(&size));
126126
r->pauxin = ndr_stack_anew<uint8_t>(NDR_STACK_IN, size);
127127
if (r->pauxin == nullptr)
128-
return NDR_ERR_ALLOC;
128+
return pack_result::alloc;
129129
TRY(pndr->g_uint8_a(r->pauxin, size));
130130
TRY(pndr->g_uint32(&r->cb_auxin));
131131
if (r->cb_auxin != size)
132-
return NDR_ERR_ARRAY_SIZE;
132+
return pack_result::array_size;
133133
TRY(pndr->g_uint32(&r->cb_auxout));
134134
if (r->cb_auxout > 0x1008)
135-
return NDR_ERR_RANGE;
136-
return NDR_ERR_SUCCESS;
135+
return pack_result::range;
136+
return pack_result::ok;
137137
}
138138

139139
static pack_result emsmdb_ndr_push_ecdoconnectex(NDR_PUSH *pndr,
@@ -167,7 +167,7 @@ static pack_result emsmdb_ndr_push_ecdoconnectex(NDR_PUSH *pndr,
167167
TRY(pndr->p_uint16(r->pbest_vers[2]));
168168
TRY(pndr->p_uint32(r->timestamp));
169169
if (r->cb_auxout > 0x1008)
170-
return NDR_ERR_RANGE;
170+
return pack_result::range;
171171
TRY(pndr->p_ulong(r->cb_auxout));
172172
TRY(pndr->p_ulong(0));
173173
TRY(pndr->p_ulong(r->cb_auxout));
@@ -197,41 +197,41 @@ static pack_result emsmdb_ndr_pull_ecdorpcext2(NDR_PULL *pndr, ECDORPCEXT2_IN *r
197197
TRY(pndr->g_ulong(&size));
198198
r->pin = ndr_stack_anew<uint8_t>(NDR_STACK_IN, size);
199199
if (r->pin == nullptr)
200-
return NDR_ERR_ALLOC;
200+
return pack_result::alloc;
201201
TRY(pndr->g_uint8_a(r->pin, size));
202202
TRY(pndr->g_uint32(&r->cb_in));
203203
if (r->cb_in != size)
204-
return NDR_ERR_ARRAY_SIZE;
204+
return pack_result::array_size;
205205
TRY(pndr->g_uint32(&r->cb_out));
206206
if (r->cb_out > 0x40000)
207-
return NDR_ERR_RANGE;
207+
return pack_result::range;
208208
TRY(pndr->g_ulong(&size));
209209
r->pauxin = ndr_stack_anew<uint8_t>(NDR_STACK_IN, size);
210210
if (r->pauxin == nullptr)
211-
return NDR_ERR_ALLOC;
211+
return pack_result::alloc;
212212
TRY(pndr->g_uint8_a(r->pauxin, size));
213213
TRY(pndr->g_uint32(&r->cb_auxin));
214214
if (r->cb_auxin != size)
215-
return NDR_ERR_ARRAY_SIZE;
215+
return pack_result::array_size;
216216
TRY(pndr->g_uint32(&r->cb_auxout));
217217
if (r->cb_auxout > 0x1008)
218-
return NDR_ERR_RANGE;
219-
return NDR_ERR_SUCCESS;
218+
return pack_result::range;
219+
return pack_result::ok;
220220
}
221221

222222
static pack_result emsmdb_ndr_push_ecdorpcext2(NDR_PUSH *pndr, const ECDORPCEXT2_OUT *r)
223223
{
224224
TRY(pndr->p_ctx_handle(r->cxh));
225225
TRY(pndr->p_uint32(r->flags));
226226
if (r->cb_out > 0x40000)
227-
return NDR_ERR_RANGE;
227+
return pack_result::range;
228228
TRY(pndr->p_ulong(r->cb_out));
229229
TRY(pndr->p_ulong(0));
230230
TRY(pndr->p_ulong(r->cb_out));
231231
TRY(pndr->p_uint8_a(r->pout, r->cb_out));
232232
TRY(pndr->p_uint32(r->cb_out));
233233
if (r->cb_auxout > 0x1008)
234-
return NDR_ERR_RANGE;
234+
return pack_result::range;
235235
TRY(pndr->p_ulong(r->cb_auxout));
236236
TRY(pndr->p_ulong(0));
237237
TRY(pndr->p_ulong(r->cb_auxout));
@@ -260,33 +260,33 @@ pack_result emsmdb_ndr_pull(int opnum, NDR_PULL *pndr, void **ppin)
260260
case ecDoDisconnect:
261261
*ppin = ndr_stack_anew<ECDODISCONNECT_IN>(NDR_STACK_IN);
262262
if (*ppin == nullptr)
263-
return NDR_ERR_ALLOC;
263+
return pack_result::alloc;
264264
return emsmdb_ndr_pull_ecdodisconnect(pndr, static_cast<ECDODISCONNECT_IN *>(*ppin));
265265
case ecRRegisterPushNotification:
266266
*ppin = ndr_stack_anew<ECRREGISTERPUSHNOTIFICATION_IN>(NDR_STACK_IN);
267267
if (*ppin == nullptr)
268-
return NDR_ERR_ALLOC;
268+
return pack_result::alloc;
269269
return emsmdb_ndr_pull_ecrregisterpushnotification(pndr, static_cast<ECRREGISTERPUSHNOTIFICATION_IN *>(*ppin));
270270
case ecDummyRpc:
271271
*ppin = NULL;
272-
return NDR_ERR_SUCCESS;
272+
return pack_result::ok;
273273
case ecDoConnectEx:
274274
*ppin = ndr_stack_anew<ECDOCONNECTEX_IN>(NDR_STACK_IN);
275275
if (*ppin == nullptr)
276-
return NDR_ERR_ALLOC;
276+
return pack_result::alloc;
277277
return emsmdb_ndr_pull_ecdoconnectex(pndr, static_cast<ECDOCONNECTEX_IN *>(*ppin));
278278
case ecDoRpcExt2:
279279
*ppin = ndr_stack_anew<ECDORPCEXT2_IN>(NDR_STACK_IN);
280280
if (*ppin == nullptr)
281-
return NDR_ERR_ALLOC;
281+
return pack_result::alloc;
282282
return emsmdb_ndr_pull_ecdorpcext2(pndr, static_cast<ECDORPCEXT2_IN *>(*ppin));
283283
case ecDoAsyncConnectEx:
284284
*ppin = ndr_stack_anew<ECDOASYNCCONNECTEX_IN>(NDR_STACK_IN);
285285
if (*ppin == nullptr)
286-
return NDR_ERR_ALLOC;
286+
return pack_result::alloc;
287287
return emsmdb_ndr_pull_ecdoasyncconnectex(pndr, static_cast<ECDOASYNCCONNECTEX_IN *>(*ppin));
288288
default:
289-
return NDR_ERR_BAD_SWITCH;
289+
return pack_result::bad_switch;
290290
}
291291
}
292292

@@ -306,6 +306,6 @@ pack_result emsmdb_ndr_push(int opnum, NDR_PUSH *pndr, void *pout)
306306
case ecDoAsyncConnectEx:
307307
return emsmdb_ndr_push_ecdoasyncconnectex(pndr, static_cast<ECDOASYNCCONNECTEX_OUT *>(pout));
308308
default:
309-
return NDR_ERR_BAD_SWITCH;
309+
return pack_result::bad_switch;
310310
}
311311
}

‎exch/http/fastcgi.cpp‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ static pack_result mod_fastcgi_push_align_record(NDR_PUSH *pndr)
283283
uint8_t padding_len;
284284

285285
if (!(pndr->offset & 7))
286-
return NDR_ERR_SUCCESS;
286+
return pack_result::ok;
287287
padding_len = 8 - (pndr->offset & 7);
288288
pndr->data[6] = padding_len;
289289
return pndr->p_zero(padding_len);
@@ -297,7 +297,7 @@ static pack_result mod_fastcgi_push_params_end(NDR_PUSH *pndr)
297297
offset = pndr->offset;
298298
len = offset - 8;
299299
if (len > 0xFFFF)
300-
return NDR_ERR_FAILURE;
300+
return pack_result::failure;
301301
pndr->offset = 4;
302302
TRY(pndr->p_uint16(len));
303303
pndr->offset = offset;
@@ -630,7 +630,7 @@ BOOL mod_fastcgi_relay_content(HTTP_CONTEXT *phttp)
630630
uint8_t ndr_buff[65800];
631631

632632
ndr_push.init(tmp_buff, 16, NDR_FLAG_NOALIGN | NDR_FLAG_BIGENDIAN);
633-
if (mod_fastcgi_push_begin_request(&ndr_push) != NDR_ERR_SUCCESS ||
633+
if (mod_fastcgi_push_begin_request(&ndr_push) != pack_result::ok ||
634634
ndr_push.offset != 16)
635635
return FALSE;
636636
ndr_length = sizeof(ndr_buff);
@@ -653,8 +653,8 @@ BOOL mod_fastcgi_relay_content(HTTP_CONTEXT *phttp)
653653
return FALSE;
654654
}
655655
ndr_push.init(tmp_buff, 8, NDR_FLAG_NOALIGN | NDR_FLAG_BIGENDIAN);
656-
if (NDR_ERR_SUCCESS != mod_fastcgi_push_params_begin(&ndr_push) ||
657-
NDR_ERR_SUCCESS != mod_fastcgi_push_params_end(&ndr_push) ||
656+
if (mod_fastcgi_push_params_begin(&ndr_push) != pack_result::ok ||
657+
mod_fastcgi_push_params_end(&ndr_push) != pack_result::ok ||
658658
8 != ndr_push.offset || 8 != write(cli_sockd, tmp_buff, 8)) {
659659
close(cli_sockd);
660660
phttp->log(LV_ERR, "Failed to write record to fastcgi back-end %s", sk_path);
@@ -673,8 +673,8 @@ BOOL mod_fastcgi_relay_content(HTTP_CONTEXT *phttp)
673673
rq.content_len -= tmp_len;
674674
}
675675
ndr_push.init(ndr_buff, sizeof(ndr_buff), NDR_FLAG_NOALIGN | NDR_FLAG_BIGENDIAN);
676-
if (NDR_ERR_SUCCESS != mod_fastcgi_push_stdin(
677-
&ndr_push, pbuff, tmp_len)) {
676+
if (mod_fastcgi_push_stdin(&ndr_push, pbuff,
677+
tmp_len) != pack_result::ok) {
678678
close(cli_sockd);
679679
phttp->log(LV_DEBUG, "failed to "
680680
"push stdin record for mod_fastcgi");
@@ -707,8 +707,8 @@ BOOL mod_fastcgi_relay_content(HTTP_CONTEXT *phttp)
707707
break;
708708
}
709709
ndr_push.init(ndr_buff, sizeof(ndr_buff), NDR_FLAG_NOALIGN | NDR_FLAG_BIGENDIAN);
710-
if (NDR_ERR_SUCCESS != mod_fastcgi_push_stdin(
711-
&ndr_push, tmp_buff, tmp_len)) {
710+
if (mod_fastcgi_push_stdin(&ndr_push, tmp_buff,
711+
tmp_len) != pack_result::ok) {
712712
close(cli_sockd);
713713
phttp->log(LV_DEBUG, "failed to "
714714
"push stdin record for mod_fastcgi");
@@ -727,8 +727,7 @@ BOOL mod_fastcgi_relay_content(HTTP_CONTEXT *phttp)
727727
}
728728
END_OF_STDIN:
729729
ndr_push.init(ndr_buff, sizeof(ndr_buff), NDR_FLAG_NOALIGN | NDR_FLAG_BIGENDIAN);
730-
if (NDR_ERR_SUCCESS != mod_fastcgi_push_stdin(
731-
&ndr_push, NULL, 0)) {
730+
if (mod_fastcgi_push_stdin(&ndr_push, nullptr, 0) != pack_result::ok) {
732731
close(cli_sockd);
733732
phttp->log(LV_DEBUG, "failed to push "
734733
"last empty stdin record for mod_fastcgi");
@@ -839,8 +838,7 @@ BOOL mod_fastcgi_read_response(HTTP_CONTEXT *phttp)
839838
return FALSE;
840839
}
841840
ndr_pull.init(header_buff, 8, NDR_FLAG_NOALIGN | NDR_FLAG_BIGENDIAN);
842-
if (NDR_ERR_SUCCESS != mod_fastcgi_pull_record_header(
843-
&ndr_pull, &header)) {
841+
if (mod_fastcgi_pull_record_header(&ndr_pull, &header) != pack_result::ok) {
844842
phttp->log(LV_DEBUG, "failed to "
845843
"pull record header in mod_fastcgi");
846844
mod_fastcgi_insert_ctx(phttp);
@@ -866,7 +864,7 @@ BOOL mod_fastcgi_read_response(HTTP_CONTEXT *phttp)
866864
}
867865
ndr_pull.init(tmp_buff, tmp_len, NDR_FLAG_NOALIGN | NDR_FLAG_BIGENDIAN);
868866
if (mod_fastcgi_pull_end_request(&ndr_pull,
869-
header.padding_len, &end_request) != NDR_ERR_SUCCESS)
867+
header.padding_len, &end_request) != pack_result::ok)
870868
phttp->log(LV_DEBUG, "failed to"
871869
" pull record body in mod_fastcgi");
872870
else
@@ -892,8 +890,8 @@ BOOL mod_fastcgi_read_response(HTTP_CONTEXT *phttp)
892890
}
893891
ndr_pull.init(tmp_buff, tmp_len, NDR_FLAG_NOALIGN | NDR_FLAG_BIGENDIAN);
894892
std_stream.length = header.content_len;
895-
if (NDR_ERR_SUCCESS != mod_fastcgi_pull_stdstream(
896-
&ndr_pull, header.padding_len, &std_stream)) {
893+
if (mod_fastcgi_pull_stdstream(&ndr_pull, header.padding_len,
894+
&std_stream) != pack_result::ok) {
897895
phttp->log(LV_DEBUG, "failed to"
898896
" pull record body in mod_fastcgi");
899897
mod_fastcgi_insert_ctx(phttp);

0 commit comments

Comments
 (0)