From 4bdbccb031054a71f7f26ef06a5125c1f82c8e0e Mon Sep 17 00:00:00 2001 From: Andrew Elder Date: Tue, 18 Sep 2012 16:59:42 -0400 Subject: [PATCH] mrpd: rename mrp_init_timers to mrpd_init_timers since they are implemented in mrpd module. --- daemons/mrpd/mmrp.c | 2 +- daemons/mrpd/mrp.h | 1 - daemons/mrpd/mrpd.c | 2 +- daemons/mrpd/mrpd.h | 9 +++++---- daemons/mrpd/msrp.c | 12 ++++++------ daemons/mrpd/mvrp.c | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/daemons/mrpd/mmrp.c b/daemons/mrpd/mmrp.c index d558692..d238295 100644 --- a/daemons/mrpd/mmrp.c +++ b/daemons/mrpd/mmrp.c @@ -1712,7 +1712,7 @@ int mmrp_init(int mmrp_enable) */ MMRP_db->mrp_db.participant = MRP_APPLICANT_CTL_NORMAL; /* default */ - rc = mrp_init_timers(&(MMRP_db->mrp_db)); + rc = mrpd_init_timers(&(MMRP_db->mrp_db)); if (rc < 0) goto abort_alloc; diff --git a/daemons/mrpd/mrp.h b/daemons/mrpd/mrp.h index 25c5628..86bf071 100644 --- a/daemons/mrpd/mrp.h +++ b/daemons/mrpd/mrp.h @@ -189,5 +189,4 @@ int mrp_registrar_fsm(mrp_registrar_attribute_t *attrib, struct mrp_database *mrp_db, int event); int mrp_decode_state(mrp_registrar_attribute_t *rattrib, mrp_applicant_attribute_t *aattrib, char *str, int strlen); -int mrp_init_timers(struct mrp_database *mrp_db); diff --git a/daemons/mrpd/mrpd.c b/daemons/mrpd/mrpd.c index ac302d5..cae23a6 100644 --- a/daemons/mrpd/mrpd.c +++ b/daemons/mrpd/mrpd.c @@ -469,7 +469,7 @@ int mrpd_close_socket(SOCKET sock) return close(sock); } -int mrp_init_timers(struct mrp_database *mrp_db) +int mrpd_init_timers(struct mrp_database *mrp_db) { mrp_db->join_timer = mrpd_timer_create(); mrp_db->lv_timer = mrpd_timer_create(); diff --git a/daemons/mrpd/mrpd.h b/daemons/mrpd/mrpd.h index 60507d7..c145667 100644 --- a/daemons/mrpd/mrpd.h +++ b/daemons/mrpd/mrpd.h @@ -37,11 +37,11 @@ /* Operating specific defines */ #if defined WIN32 #include -struct win_timer { - void *timer_struct; -}; -typedef struct win_timer HTIMER; +typedef int socklen_t; +typedef void *HTIMER; #define snprintf _snprintf +#define random rand +#define send mrpw_send #elif defined __linux__ #include typedef int HTIMER; @@ -108,6 +108,7 @@ typedef struct mrpdu { #define MRPD_PORT_DEFAULT 7500 #define MAX_MRPD_CMDSZ (1500) +int mrpd_init_timers(struct mrp_database *mrp_db); int mrpd_timer_start(HTIMER timerfd, unsigned long value_ms); int mrpd_timer_stop(HTIMER timerfd); int mrpd_send_ctl_msg(struct sockaddr_in *client_addr, char *notify_data, diff --git a/daemons/mrpd/msrp.c b/daemons/mrpd/msrp.c index 3089e4c..873ae2a 100644 --- a/daemons/mrpd/msrp.c +++ b/daemons/mrpd/msrp.c @@ -1464,17 +1464,17 @@ msrp_emit_talkvectors(unsigned char *msgbuf, unsigned char *msgbuf_eof, attrib->attribute.talk_listen.DataFrameParameters. Vlan_ID >> 8; mrpdu_vectorptr->FirstValue_VectorEvents[15] = - attrib->attribute.talk_listen.DataFrameParameters.Vlan_ID; + (uint8_t)attrib->attribute.talk_listen.DataFrameParameters.Vlan_ID; mrpdu_vectorptr->FirstValue_VectorEvents[16] = attrib->attribute.talk_listen.TSpec.MaxFrameSize >> 8; mrpdu_vectorptr->FirstValue_VectorEvents[17] = - attrib->attribute.talk_listen.TSpec.MaxFrameSize; + (uint8_t)attrib->attribute.talk_listen.TSpec.MaxFrameSize; mrpdu_vectorptr->FirstValue_VectorEvents[18] = attrib->attribute.talk_listen.TSpec.MaxIntervalFrames >> 8; mrpdu_vectorptr->FirstValue_VectorEvents[19] = - attrib->attribute.talk_listen.TSpec.MaxIntervalFrames; + (uint8_t)attrib->attribute.talk_listen.TSpec.MaxIntervalFrames; mrpdu_vectorptr->FirstValue_VectorEvents[20] = attrib->attribute.talk_listen.PriorityAndRank; @@ -2495,7 +2495,7 @@ int msrp_recv_cmd(char *buf, int buflen, struct sockaddr_in *client) rc = sscanf((char *)&(buf[i]), "%d", &prio); - attrib->attribute.domain.SRclassPriority = (uint16_t)prio; + attrib->attribute.domain.SRclassPriority = (uint8_t)prio; if (0 == rc) { snprintf(respbuf, sizeof(respbuf) - 1, "ERP %s", buf); @@ -2691,7 +2691,7 @@ int msrp_recv_cmd(char *buf, int buflen, struct sockaddr_in *client) rc = sscanf((char *)&(buf[i]), "%d", &prio); - attrib->attribute.domain.SRclassPriority = (uint16_t)prio; + attrib->attribute.domain.SRclassPriority = (uint8_t)prio; if (0 == rc) { snprintf(respbuf, sizeof(respbuf) - 1, "ERP %s", buf); @@ -3040,7 +3040,7 @@ int msrp_init(int msrp_enable) */ MSRP_db->mrp_db.participant = MRP_APPLICANT_CTL_NORMAL; /* default */ - rc = mrp_init_timers(&(MSRP_db->mrp_db)); + rc = mrpd_init_timers(&(MSRP_db->mrp_db)); if (rc < 0) goto abort_alloc; diff --git a/daemons/mrpd/mvrp.c b/daemons/mrpd/mvrp.c index 67acaef..6944432 100644 --- a/daemons/mrpd/mvrp.c +++ b/daemons/mrpd/mvrp.c @@ -1174,7 +1174,7 @@ int mvrp_init(int mvrp_enable) */ MVRP_db->mrp_db.participant = MRP_APPLICANT_CTL_NORMAL; /* default */ - rc = mrp_init_timers(&(MVRP_db->mrp_db)); + rc = mrpd_init_timers(&(MVRP_db->mrp_db)); if (rc < 0) goto abort_alloc; -- 2.7.4