Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
kibaamor committed Nov 9, 2021
2 parents 4f460b6 + 11015a7 commit e9cbf08
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 16 deletions.
10 changes: 2 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
A cross platform lock-free and timer-supported C++11 network library.

[![AppVeyor](https://img.shields.io/appveyor/build/kibaamor/knet/master?label=AppVeyor&style=flat-square)](https://ci.appveyor.com/project/KibaAmor/knet)
[![Travis CI](https://img.shields.io/travis/kibaamor/knet/master?label=Travis%20CI&style=flat-square)](https://www.travis-ci.com/github/KibaAmor/knet)
[![License](https://img.shields.io/github/license/kibaamor/knet?label=License&style=flat-square)](./LICENSE)
[![Standard](https://img.shields.io/badge/C++-11-blue.svg?style=flat-square)](https://github.com/kibaamor/knet)
[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FKibaAmor%2Fknet.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2FKibaAmor%2Fknet?ref=badge_shield)
Expand All @@ -24,8 +23,7 @@ A cross platform lock-free and timer-supported C++11 network library.
- [Echo Server and Client](#echo-server-and-client)
- [Protocol](#protocol)
- [Echo Server](#echo-server)
- [Echo Client](#echo-client)
- [Code Quality](#code-quality)
- [Echo Client](#echo-client)
- [License](#license)

--------
Expand Down Expand Up @@ -124,7 +122,7 @@ The server provides two types:
- Synchronous Echo Server[examples/server/sync_server.cpp](./examples/server/sync_server.cpp)
- Asynchronous Echo Server[examples/server/async_server.cpp](./examples/server/async_server.cpp)

### Echo Client
#### Echo Client

The client actively connects to the server after starting (and automatically reconnects the server if the connection is not available), and when the connection is successful, it actively sends an `incomplete` network package to the server.

Expand All @@ -135,10 +133,6 @@ The client provides two types:
- Synchronous Echo Client[examples/client/sync_client.cpp](./examples/client/sync_client.cpp)
- Asynchronous Echo Client[examples/client/async_client.cpp](./examples/client/async_client.cpp)

### Code Quality

[![Code quality status](https://codescene.io/projects/7651/status.svg)](https://codescene.io/projects/7651/jobs/latest-successful/results)

## License

[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FKibaAmor%2Fknet.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2FKibaAmor%2Fknet?ref=badge_large)
10 changes: 2 additions & 8 deletions README_zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
一个跨平台的无锁且支持定时器的C++11网络库。

[![AppVeyor](https://img.shields.io/appveyor/build/kibaamor/knet/master?label=AppVeyor&style=flat-square)](https://ci.appveyor.com/project/KibaAmor/knet)
[![Travis CI](https://img.shields.io/travis/kibaamor/knet/master?label=Travis%20CI&style=flat-square)](https://www.travis-ci.com/github/KibaAmor/knet)
[![License](https://img.shields.io/github/license/kibaamor/knet?label=License&style=flat-square)](./LICENSE)
[![Standard](https://img.shields.io/badge/C++-11-blue.svg?style=flat-square)](https://github.com/kibaamor/knet)
[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FKibaAmor%2Fknet.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2FKibaAmor%2Fknet?ref=badge_shield)
Expand All @@ -24,8 +23,7 @@
- [echo服务器和客户端](#echo服务器和客户端)
- [通信协议](#通信协议)
- [echo服务器](#echo服务器)
- [echo客户端](#echo客户端)
- [代码质量](#代码质量)
- [echo客户端](#echo客户端)
- [授权](#授权)

--------
Expand Down Expand Up @@ -124,7 +122,7 @@ echo服务器将接收到的数据原封不动的发回给客户端。
- 同步方式的echo服务端[examples/server/sync_server.cpp](./examples/server/sync_server.cpp)
- 异步方式的echo服务端[examples/server/async_server.cpp](./examples/server/async_server.cpp)

### echo客户端
#### echo客户端

客户端启动后主动连接服务器(如果连接不上服务器,则会自动重连服务器),连接成功后,会主动给服务器发送`不完整的`网络包。

Expand All @@ -135,10 +133,6 @@ echo服务器将接收到的数据原封不动的发回给客户端。
- 同步方式的echo客户端[examples/client/sync_client.cpp](./examples/client/sync_client.cpp)
- 异步方式的echo客户端[examples/client/async_client.cpp](./examples/client/async_client.cpp)

### 代码质量

[![代码质量状态](https://codescene.io/projects/7651/status.svg)](https://codescene.io/projects/7651/jobs/latest-successful/results)

## 授权

[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FKibaAmor%2Fknet.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2FKibaAmor%2Fknet?ref=badge_large)

0 comments on commit e9cbf08

Please sign in to comment.