sailfishos/ofono
1
0
Fork 1
mirror of https://github.com/sailfishos/ofono synced 2025-11-23 01:35:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

[gril] Change oFono gril to take a socket path. MER#1107

Browse Source 
This allows configuring at startup the socket path to which gril
will connect to.
This commit is contained in:
Tommi Kenakkala
2015-06-22 11:02:07 +03:00
parent 7eb6d5559a
commit fbd59a8dc9
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ofono/gril/gril.c
View File

@@ -51,9 +51,6 @@
#define COMMAND_FLAG_EXPECT_PDU 0x1
#define COMMAND_FLAG_EXPECT_SHORT_PROMPT 0x2
#define RILD_CMD_SOCKET "/dev/socket/rild"
#define RILD_DBG_SOCKET "/dev/socket/rild-debug"
struct ril_request {
gchar *data;
guint data_len;
@@ -807,7 +804,7 @@ static gboolean node_compare_by_group(struct ril_notify_node *node,
return FALSE;
}
static struct ril_s *create_ril()
static struct ril_s *create_ril(const char *sockpath)
{
struct ril_s *ril;
@@ -819,6 +816,10 @@ static struct ril_s *create_ril()
GError *err = NULL;
char *path = "/etc/ofono/ril_subscription.conf";
DBG("sockpath: %s", sockpath);
if (!sockpath)
return NULL;
ril = g_try_new0(struct ril_s, 1);
if (ril == NULL)
return ril;
@@ -841,7 +842,7 @@ static struct ril_s *create_ril()
memset(&addr, 0, sizeof(addr));
addr.sun_family = AF_UNIX;
strncpy(addr.sun_path, RILD_CMD_SOCKET, sizeof(addr.sun_path) - 1);
strncpy(addr.sun_path, sockpath, sizeof(addr.sun_path) - 1);
if (connect(ril->sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
ofono_error("%s: can't connect to RILD: %s (%d)\n",
@@ -1074,15 +1075,16 @@ void g_ril_init_parcel(struct ril_msg *message, struct parcel *rilp)
rilp->offset = 0;
}
GRil *g_ril_new()
GRil *g_ril_new(const char *sockpath)
{
DBG("");
GRil *ril;
ril = g_try_new0(GRil, 1);
if (ril == NULL)
return NULL;
ril->parent = create_ril();
ril->parent = create_ril(sockpath);
if (ril->parent == NULL) {
g_free(ril);
return NULL;

2
ofono/gril/gril.h
View File

@@ -93,7 +93,7 @@ extern char print_buf[];
void g_ril_init_parcel(struct ril_msg *message, struct parcel *rilp);
GRil *g_ril_new();
GRil *g_ril_new(const char *sockpath);
GIOChannel *g_ril_get_channel(GRil *ril);
GRilIO *g_ril_get_io(GRil *ril);