diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2007-08-21 21:23:37 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2007-08-21 21:23:37 +0000 |
| commit | 7a57f956b86658183404fddaa28baaceb4378c65 (patch) | |
| tree | b8d308013838c2e75d6d1996594412fa48adfeb9 /epan/dissectors/packet-jxta.c | |
| parent | 0c3e8b7c312c91a5fc0c3badf9aba0aba9470684 (diff) | |
Change COPY_ADDRESS to SE_COPY_ADDRESS: all of these appear to have "seasonal" scope (e.g., they are used in conversations or similar).
svn path=/trunk/; revision=22573
Diffstat (limited to 'epan/dissectors/packet-jxta.c')
| -rw-r--r-- | epan/dissectors/packet-jxta.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index e8d82bb42c..0c944c18f6 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -769,7 +769,7 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree * /* The initiator welcome frame */ tpt_conv_data->tpt_ptype = pinfo->ptype; tpt_conv_data->initiator_welcome_frame = pinfo->fd->num; - COPY_ADDRESS(&tpt_conv_data->initiator_tpt_address, &pinfo->src); + SE_COPY_ADDRESS(&tpt_conv_data->initiator_tpt_address, &pinfo->src); tpt_conv_data->initiator_tpt_port = pinfo->srcport; welcome_addr = &tpt_conv_data->initiator_address; @@ -782,7 +782,7 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tpt_conv_data->receiver_tpt_port = tpt_conv_data->initiator_tpt_port; tpt_conv_data->receiver_address = tpt_conv_data->initiator_address; tpt_conv_data->initiator_welcome_frame = pinfo->fd->num; - COPY_ADDRESS(&tpt_conv_data->initiator_tpt_address, &pinfo->src); + SE_COPY_ADDRESS(&tpt_conv_data->initiator_tpt_address, &pinfo->src); tpt_conv_data->initiator_tpt_port = pinfo->srcport; welcome_addr = &tpt_conv_data->initiator_address; @@ -791,7 +791,7 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree * /* The receiver welcome frame */ tpt_conv_data->tpt_ptype = pinfo->ptype; tpt_conv_data->receiver_welcome_frame = pinfo->fd->num; - COPY_ADDRESS(&tpt_conv_data->receiver_tpt_address, &pinfo->src); + SE_COPY_ADDRESS(&tpt_conv_data->receiver_tpt_address, &pinfo->src); tpt_conv_data->receiver_tpt_port = pinfo->srcport; welcome_addr = &tpt_conv_data->receiver_address; @@ -984,17 +984,17 @@ static conversation_t *get_tpt_conversation(packet_info * pinfo, gboolean create tpt_conv_data = se_alloc(sizeof(jxta_stream_conversation_data)); tpt_conv_data->tpt_ptype = pinfo->ptype; - COPY_ADDRESS(&tpt_conv_data->initiator_tpt_address, &pinfo->src); + SE_COPY_ADDRESS(&tpt_conv_data->initiator_tpt_address, &pinfo->src); tpt_conv_data->initiator_tpt_port = pinfo->srcport; tpt_conv_data->initiator_welcome_frame = 0; /* XXX bondolo This is not quite correct as it should include port until a peerid can be associated. */ - COPY_ADDRESS(&tpt_conv_data->initiator_address, &pinfo->src); + SE_COPY_ADDRESS(&tpt_conv_data->initiator_address, &pinfo->src); - COPY_ADDRESS(&tpt_conv_data->receiver_tpt_address, &pinfo->dst); + SE_COPY_ADDRESS(&tpt_conv_data->receiver_tpt_address, &pinfo->dst); tpt_conv_data->receiver_tpt_port = pinfo->destport; tpt_conv_data->receiver_welcome_frame = 0; /* XXX bondolo This is not quite correct as it should include port until a peerid can be associated. */ - COPY_ADDRESS(&tpt_conv_data->receiver_address, &pinfo->dst); + SE_COPY_ADDRESS(&tpt_conv_data->receiver_address, &pinfo->dst); conversation_add_proto_data(tpt_conversation, proto_jxta, tpt_conv_data); } |