uint8_t cause;
uint8_t addr_type;
uint8_t presentation;
+ uint8_t name_presentation;
uint8_t reason;
char address[20];
+ char name[20];
char addr_pad[4];
};
isi_call_any_address_sb_proc(ivc, call, sb);
}
+static void isi_call_origin_info_sb_proc(struct isi_voicecall *ivc,
+ struct isi_call *call,
+ GIsiSubBlockIter *sb)
+{
+ uint8_t pres;
+ uint8_t id;
+ uint8_t len;
+ char *name;
+
+ if (!g_isi_sb_iter_get_byte(sb, &pres, 2))
+ return;
+
+ if (!g_isi_sb_iter_get_byte(sb, &id, 6))
+ return;
+
+ if (!g_isi_sb_iter_get_byte(sb, &len, 7))
+ return;
+
+ if (!g_isi_sb_iter_get_alpha_tag(sb, &name, 2 * len, 8))
+ return;
+
+ DBG("Got name %s", name);
+ call->name_presentation = pres;
+ strncpy(call->name, name, sizeof(call->name));
+
+ g_free(name);
+}
+
static void isi_call_mode_sb_proc(struct isi_voicecall *ivc,
struct isi_call *call,
GIsiSubBlockIter *sb)
ocall.status = isi_call_status_to_clcc(call);
memcpy(number->number, call->address, sizeof(number->number));
+ memcpy(ocall.name, call->name, sizeof(ocall.name));
number->type = 0x80 | call->addr_type;
ocall.clip_validity = call->presentation & 3;
+ ocall.cnap_validity = call->name_presentation & 3;
if (ocall.clip_validity == 0 && strlen(number->number) == 0)
ocall.clip_validity = 2;
+ if (ocall.cnap_validity == 0 && strlen(call->name) == 0)
+ ocall.cnap_validity = 2;
+
return ocall;
}
ocall = isi_call_as_ofono_call(call);
- DBG("id=%u,%s,%u,\"%s\",%u,%u",
+ DBG("id=%u,%s,%u,\"%s\",\"%s\",%u,%u",
ocall.id,
ocall.direction ? "terminated" : "originated",
ocall.status,
ocall.phone_number.number,
+ ocall.name,
ocall.phone_number.type,
ocall.clip_validity);
isi_call_origin_address_sb_proc(ivc, call, &iter);
break;
+ case CALL_ORIGIN_INFO:
+ isi_call_origin_info_sb_proc(ivc, call, &iter);
+ break;
+
case CALL_GSM_DETAILED_CAUSE:
case CALL_DESTINATION_PRE_ADDRESS:
case CALL_DESTINATION_POST_ADDRESS: