修复: 1.server port == 0时的处理(getport获取临时端口); 2.增加peeksize()接口用于确定待接收数据大小. #5
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rockcarry
reviewed
Mar 9, 2023
| @@ -353,6 +353,9 @@ void* ffrdp_init(char *ip, int port, char *txkey, char *rxkey, int server, int s | |||
| if (bind(ffrdp->udp_fd, (struct sockaddr*)&ffrdp->server_addr, sizeof(ffrdp->server_addr)) == -1) { | |||
| printf("failed to bind !\n"); | |||
| goto failed; | |||
| } else { | |||
| int len = sizeof (ffrdp->server_addr); | |||
rockcarry
reviewed
Mar 9, 2023
| @@ -306,7 +306,7 @@ static int ffrdp_recv_data_frame(FFRDPCONTEXT *ffrdp, FFRDP_FRAME_NODE *frame) | |||
| return 0; | |||
| } | |||
|
|
|||
| void* ffrdp_init(char *ip, int port, char *txkey, char *rxkey, int server, int smss, int sfec) | |||
| void* ffrdp_init(const char *ip, int port, const char *txkey, const char *rxkey, int server, int smss, int sfec) | |||
There was a problem hiding this comment.
我不太习惯用 const，代码搞得复杂了，并且并不会带来什么好处。你的看法是？
There was a problem hiding this comment.
因为在C++11环境中, 字符串字面量为const char *, 这会引发一些警告
There was a problem hiding this comment.
这个c代码本身编译不会报警告的，c++调用这个接口，增加一个类型转换 (char*)
rockcarry
reviewed
Mar 9, 2023
| @@ -376,6 +379,18 @@ void* ffrdp_init(char *ip, int port, char *txkey, char *rxkey, int server, int s | |||
| return NULL; | |||
| } | |||
|
|
|||
| int ffrdp_getport(void *ctxt) | |||
There was a problem hiding this comment.
如果前面对 bind 失败的改动不是必须的，这个接口的增加也不是必须的了
rockcarry
reviewed
Mar 9, 2023
| @@ -433,6 +448,13 @@ int ffrdp_recv(void *ctxt, char *buf, int len) | |||
| return ret; | |||
| } | |||
|
|
|||
| int ffrdp_peeksize(void *ctxt) | |||
There was a problem hiding this comment.
能说下什么场景会用到这个接口，因为我的测试程序里面，没有使用这个，也一样工作得挺正常。
There was a problem hiding this comment.
在使用事件循环的场景中，通常做法是peeksize有数据时触发读取事件，而不会立即recv，所以需要一个这样的接口
There was a problem hiding this comment.
ffrdp_recv 是非阻塞的，其返回值已经实现了你所需的功能。
There was a problem hiding this comment.
ffrdp_recv 返回值是 MIN(len, ffrdp->recv_size); 并不等同于 recv_size。
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
1.修复传入 server port == 0 时 server_addr 不正确的端口, 并增加 ffrdp_getport() 获取临时端口号.
2.增加 ffrdp_peeksize() 接口用于确定待接收数据大小, 因为很多时候并非循环 recv().