Re: [PATCH] utils/mtbatch.c DLR support patch [revised]

Hi,

applied ;)
Btw. please configure with --enable-warnings and check warnings. I  
fixed this one for you:
utils/mtbatch.c: In function ‘run_batch’:
utils/mtbatch.c:305: warning: unused variable ‘use_dlr’


Thanks,
Alex

Am 15.04.2009 um 11:04 schrieb Vincent CHAVANIS:

>
> and this new one?
> I've also changed my inline attachement into my mailer.
> (it was an hidden option sigh!)
>
> Vincent.
>
>
> Alexander Malysh a écrit :
>> Hi,
>> I don't know what's going on but I'm unable to apply your patches.  
>> I have to apply rejects manually, please fix
>> your system or tell me how to apply your patches cleanly:
>> alex:gateway$ patch -p2 --dry-run < mtbatch_r2.txt
>> (Stripping trailing CRs from patch.)
>> patching file utils/mtbatch.c
>> patch: **** malformed patch at line 75: @@ -389,6 +407,9 @@
>> Thanks,
>> Alex
>> Am 09.04.2009 um 17:09 schrieb Vincent CHAVANIS:
>>>
>>> yep you're right.
>>> also fix missing headers.
>>> and panic text.
>>>
>>>
>>>
>>>
>>> Alexander Malysh a écrit :
>>>> hi,
>>>> you don't need this check for each message:
>>>> +        if (use_dlr == 1) {
>>>> +            msg->sms.dlr_mask = dlr_mask;
>>>> +            msg->sms.dlr_url = octstr_duplicate(dlr_url);
>>>> +        }
>>>> because you already checked that if dlr-mask supplied that  
>>>> dlr_url is also supplied.
>>>> Thanks,
>>>> Alex
>>>> Am 09.04.2009 um 12:34 schrieb Vincent CHAVANIS:
>>>>>
>>>>> here is a revised version
>>>>>
>>>>> Vincent.
>>>>>
>>>>> Alexander Malysh a écrit :
>>>>>> Hi Vincent,
>>>>>> some comments to your patch:
>>>>>> +
>>>>>> +        if (dlr_mask > 0 && dlr_url) {
>>>>>> +            msg->sms.dlr_mask = dlr_mask;
>>>>>> +            msg->sms.dlr_url = octstr_duplicate(dlr_url);
>>>>>> +        }
>>>>>> don't check this for each message, check this once by start and  
>>>>>> please use dlr macros:
>>>>>> DLR_IS_ENABLED(dlr_mask)
>>>>>>           case 'f':
>>>>>>               from = octstr_create(optarg);
>>>>>>               break;
>>>>>> +
>>>>>> +            case 'D':
>>>>>> +                dlr_mask = atoi(optarg);
>>>>>> please kill extra line
>>>>>> +    if (dlr_mask && dlr_url == NULL)
>>>>>> +        panic(0,"dlr-url address not specified. Use option -D  
>>>>>> to specify dlr-url address.");
>>>>>> +
>>>>>> should be if ((DLR_IS_ENABLED(dlr_mask) && dlr_url == NULL) ||  
>>>>>> (!DLR_IS_ENABLED(dlr_mask) && dlr_url != NULL)
>>>>>> Thanks,
>>>>>> Alex
>>>>>> Am 07.04.2009 um 12:53 schrieb Vincent CHAVANIS:
>>>>>>>
>>>>>>> This patch add a DLR support for mtbatch.
>>>>>>> Will try to provide the charset/udh patch soon
>>>>>>>
>>>>>>> Vincent.
>>>>>>>
>>>>>>>
>>> <mtbatch_r2.txt>
>
> -- 
> Telemaque - 06560 SOPHIA-ANTIPOLIS - (FR)
> Service Technique/Reseau - NOC
> Direction du Developpement xMS+
> http://www.telemaque.fr/
> [email protected]
> Tel : +33 4 92 90 99 84 (fax 9142)
> <mtbatch_r3.txt>