RE: Versioning (was: critical bug in EMI2 module)
"Oded Arbel" <[email protected]>
| Newsgroups | gmane.comp.mobile.kannel.devel |
|---|---|
| Message-ID | <[email protected]> |
> -----Original Message----- > From: Stipe Tolj [mailto:[email protected]] > There are at least 2 new features since the fixes and I don't want to > release things declared as "stable" unless we have enough time passed > to let people try things out. In that case, and if you can easily distinguish between the fix patches and the new features patches, then do patch the 1_2_0 branch and release as 1.2.1. As for 1.3 - IMO we shouldn't tag the head - when we feel that it's stable enough, then we can release it as 1.3.0 (stable). I don't think we should be folowing the "linux kernel style" versioning system, since there is no real need for versioning the development branch - every one just uses the CVS HEAD. Speaking of EMI2 and new features, would someone please look at the EMI2 patches Dima subnmitted last week and comit to CVS or at least comment about ? Here it is attached (again). -- Oded Arbel m-Wise mobile solutions [email protected] +972-9-9581711 +972-67-340014 ::.. A man wrapped up in himself makes a very small package.
smsc_emi2.patch
(application/octet-stream, 2.2 KB)
--- gw/smsc_emi2.c 2002-07-24 16:18:32.000000000 +0300
+++ gw/smsc_emi2.c 2002-07-24 19:09:17.000000000 +0300
@@ -67,6 +67,8 @@
time_t check_time;
int idle_timeout; /* Seconds a Main connection to the SMSC is allowed to be idle.
If 0, no idle timeout is in effect */
+ Octstr *npid; /* Notification PID value */
+ Octstr *nadc; /* Notification Address */
} PrivData;
typedef enum {
@@ -459,10 +461,14 @@
/* even the sender might not be interested in delivery or non delivery */
/* we still need them back to clear out the memory after the message */
/* has been delivered or non delivery has been confirmed */
- if (msg->sms.dlr_mask & 0x07) {
+ if (msg->sms.dlr_mask & (DLR_SUCCESS | DLR_FAIL | DLR_BUFFERED)) {
emimsg->fields[E50_NRQ] = octstr_create("1");
- emimsg->fields[E50_NT] = octstr_create("");
- octstr_append_decimal(emimsg->fields[E50_NT], 3 + (msg->sms.dlr_mask & 0x04));
+ emimsg->fields[E50_NT] = octstr_create("");
+ octstr_append_decimal(emimsg->fields[E50_NT], 3 + (msg->sms.dlr_mask & DLR_BUFFERED));
+ if (privdata->npid)
+ emimsg->fields[E50_NPID] = octstr_duplicate(privdata->npid);
+ if (privdata->nadc)
+ emimsg->fields[E50_NADC] = octstr_duplicate(privdata->nadc);
}
return emimsg;
}
@@ -1246,6 +1252,8 @@
octstr_destroy(privdata->my_number);
octstr_destroy(privdata->username);
octstr_destroy(privdata->password);
+ octstr_destroy(privdata->npid);
+ octstr_destroy(privdata->nadc);
gw_free(privdata);
conn->data = NULL;
@@ -1552,6 +1560,9 @@
privdata->my_number = cfg_get(cfg, octstr_imm("my-number"));
+ privdata->npid = cfg_get(cfg, octstr_imm("notification-pid"));
+ privdata->nadc = cfg_get(cfg, octstr_imm("notification-addr"));
+
cfg_get_bool(&privdata->retry, cfg, octstr_imm("retry"));
if(privdata->retry < 0)
privdata->retry = 0;
--- gwlib/cfg.def 2002-07-24 16:18:32.000000000 +0300
+++ gwlib/cfg.def 2002-07-24 19:14:35.000000000 +0300
@@ -214,6 +214,8 @@
OCTSTR(transceiver-mode)
OCTSTR(interface-version)
OCTSTR(priority)
+ OCTSTR(notification-pid)
+ OCTSTR(notification-addr)
)